diff --git a/Jenkinsfile b/Jenkinsfile index 70c91a4178..4d6d020324 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,11 +4,11 @@ pipeline { environment { lockFilePath = null version = null - silverpeasCore = 'Master' + silverpeasCore = 'Stable' } agent { docker { - image 'silverpeas/silverbuild' + image 'silverpeas/silverbuild:6.2.1' args '-v $HOME/.m2:/home/silverbuild/.m2 -v $HOME/.gitconfig:/home/silverbuild/.gitconfig -v $HOME/.ssh:/home/silverbuild/.ssh -v $HOME/.gnupg:/home/silverbuild/.gnupg' } } @@ -157,4 +157,4 @@ def checkParentPOMVersion(version) { mvn versions:update-parent -DgenerateBackupPoms=false -DparentVersion="[${parentVersion}]" """ } -} \ No newline at end of file +} diff --git a/almanach/almanach-configuration/pom.xml b/almanach/almanach-configuration/pom.xml index 73e444de25..ddd40bdeae 100644 --- a/almanach/almanach-configuration/pom.xml +++ b/almanach/almanach-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>almanach</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.almanach</groupId> diff --git a/almanach/almanach-configuration/src/main/config/migrations/modules/almanach-migration.xml b/almanach/almanach-configuration/src/main/config/migrations/modules/almanach-migration.xml index 3200a86022..a57fdc1ee5 100644 --- a/almanach/almanach-configuration/src/main/config/migrations/modules/almanach-migration.xml +++ b/almanach/almanach-configuration/src/main/config/migrations/modules/almanach-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <migration module="almanach" diff --git a/almanach/almanach-configuration/src/main/config/migrations/scripts/almanach/up005/moveToCalendarEngine.groovy b/almanach/almanach-configuration/src/main/config/migrations/scripts/almanach/up005/moveToCalendarEngine.groovy index 0fc638070f..aa60825bcd 100644 --- a/almanach/almanach-configuration/src/main/config/migrations/scripts/almanach/up005/moveToCalendarEngine.groovy +++ b/almanach/almanach-configuration/src/main/config/migrations/scripts/almanach/up005/moveToCalendarEngine.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ import java.sql.SQLException diff --git a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach.properties b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach.properties index 07d03dcc51..6da91f59d9 100644 --- a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach.properties +++ b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # suppressionConfirmation = Etes-vous s\u00fbr(e) de vouloir supprimer cet \u00e9v\u00e9nement aucunEvenement = Aucun \u00e9v\u00e9nement programm\u00e9 diff --git a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_de.properties b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_de.properties index c4d1133251..c859d43f51 100644 --- a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_de.properties +++ b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # suppressionConfirmation = Sind Sie sicher, das Ereignis l\u00f6schen zu wollen? diff --git a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_en.properties b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_en.properties index 438d0d48e3..6a65832da5 100644 --- a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_en.properties +++ b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # suppressionConfirmation = Are you sure you want to delete this event? aucunEvenement = No events diff --git a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_fr.properties b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_fr.properties index 8b23634371..ae304a3aff 100644 --- a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_fr.properties +++ b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/multilang/almanach_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # suppressionConfirmation = Etes-vous s\u00fbr(e) de vouloir supprimer cet \u00e9v\u00e9nement aucunEvenement = Aucun \u00e9v\u00e9nement programm\u00e9 diff --git a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/settings/almanachIcons.properties b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/settings/almanachIcons.properties index 5525fb006c..b0842274df 100644 --- a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/settings/almanachIcons.properties +++ b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/settings/almanachIcons.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -10,7 +10,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +18,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. almanach.icons.addEvent=/util/icons/create-action/add-event.png almanach.icons.addCalendar=/util/icons/create-action/add-table.png diff --git a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/settings/almanachSettings.properties b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/settings/almanachSettings.properties index ba82c0f3cf..c9330165c2 100644 --- a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/settings/almanachSettings.properties +++ b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/almanach/settings/almanachSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # 0=In sub/spaces only 1=in current space and subspaces 2=All almanachs diff --git a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/util/logging/almanachLogging.properties b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/util/logging/almanachLogging.properties index 11bcf46089..0660367168 100644 --- a/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/util/logging/almanachLogging.properties +++ b/almanach/almanach-configuration/src/main/config/properties/org/silverpeas/util/logging/almanachLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/almanach/almanach-configuration/src/main/config/xmlcomponents/almanach.xml b/almanach/almanach-configuration/src/main/config/xmlcomponents/almanach.xml index bda7685759..20eb1157e0 100644 --- a/almanach/almanach-configuration/src/main/config/xmlcomponents/almanach.xml +++ b/almanach/almanach-configuration/src/main/config/xmlcomponents/almanach.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <WAComponent xmlns="http://silverpeas.org/xml/ns/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/almanach/almanach-library/pom.xml b/almanach/almanach-library/pom.xml index 5aa7dc5f64..52229347fb 100644 --- a/almanach/almanach-library/pom.xml +++ b/almanach/almanach-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>almanach</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.almanach</groupId> diff --git a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachContentManager.java b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachContentManager.java index f4e072191f..cb1f8103a1 100644 --- a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachContentManager.java +++ b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstanceContributionManager.java b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstanceContributionManager.java index 928107a101..a5af7b88c0 100644 --- a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstanceContributionManager.java +++ b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstanceContributionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstancePostConstruction.java b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstancePostConstruction.java index 2aa078f8b2..e8d1db61c3 100644 --- a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstancePostConstruction.java +++ b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstancePreDestruction.java b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstancePreDestruction.java index d952522c25..466ac4e22e 100644 --- a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstancePreDestruction.java +++ b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachRuntimeException.java b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachRuntimeException.java index cb3c6e6b40..0a728fed5b 100644 --- a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachRuntimeException.java +++ b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachSettings.java b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachSettings.java index 15e16832c7..dee30ef9ad 100644 --- a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachSettings.java +++ b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachSettings.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachStatistics.java b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachStatistics.java index 16d9374835..501ca25090 100644 --- a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachStatistics.java +++ b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/AlmanachStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/subscription/AlmanachSubscriptionService.java b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/subscription/AlmanachSubscriptionService.java index 3b4bf95edb..6469ca9fea 100644 --- a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/subscription/AlmanachSubscriptionService.java +++ b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/subscription/AlmanachSubscriptionService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach.subscription; diff --git a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/workflowextensions/AlmanachTriggerParam.java b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/workflowextensions/AlmanachTriggerParam.java index f8a9e9175e..76ea936772 100644 --- a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/workflowextensions/AlmanachTriggerParam.java +++ b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/workflowextensions/AlmanachTriggerParam.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach.workflowextensions; diff --git a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/workflowextensions/SendInAlmanach.java b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/workflowextensions/SendInAlmanach.java index b775f7ad17..201aca907c 100644 --- a/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/workflowextensions/SendInAlmanach.java +++ b/almanach/almanach-library/src/main/java/org/silverpeas/components/almanach/workflowextensions/SendInAlmanach.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach.workflowextensions; diff --git a/almanach/almanach-war/pom.xml b/almanach/almanach-war/pom.xml index 35f0491e7c..79c56352ec 100644 --- a/almanach/almanach-war/pom.xml +++ b/almanach/almanach-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>almanach</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.almanach</groupId> @@ -46,8 +46,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> </dependency> <dependency> <groupId>org.silverpeas.core</groupId> diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachIndexer.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachIndexer.java index 1b744520f4..24964ee8dc 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachIndexer.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachInstanceRoutingMap.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachInstanceRoutingMap.java index 0fe70c9f93..d6a69f8668 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachInstanceRoutingMap.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachInstanceRoutingMap.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachTimeWindowViewContext.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachTimeWindowViewContext.java index 99102d6a11..7e4f12086f 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachTimeWindowViewContext.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachTimeWindowViewContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachWebController.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachWebController.java index b156044668..53c287e081 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachWebController.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachWebController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachWebRequestContext.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachWebRequestContext.java index 47780889ee..bc260b729b 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachWebRequestContext.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/AlmanachWebRequestContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/GoToEvent.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/GoToEvent.java index f6b8c09e42..1fa549c681 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/GoToEvent.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/GoToEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/ResultSearchRenderer.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/ResultSearchRenderer.java index cf7c26cd88..61bb388cac 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/ResultSearchRenderer.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/ResultSearchRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach; diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/notification/AlmanachInstanceManualUserNotification.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/notification/AlmanachInstanceManualUserNotification.java index 6839c69169..07f6ae0507 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/notification/AlmanachInstanceManualUserNotification.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/notification/AlmanachInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach.notification; diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachCalendarResource.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachCalendarResource.java index 286ab4af15..cd94e949d5 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachCalendarResource.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachCalendarResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach.services; diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachICalendarResource.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachICalendarResource.java index ea31e180c3..6c19464191 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachICalendarResource.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachICalendarResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach.services; diff --git a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachWebManager.java b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachWebManager.java index 59c1c88b88..fc896e446b 100644 --- a/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachWebManager.java +++ b/almanach/almanach-war/src/main/java/org/silverpeas/components/almanach/services/AlmanachWebManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.almanach.services; diff --git a/almanach/almanach-war/src/main/webapp/WEB-INF/web.xml b/almanach/almanach-war/src/main/webapp/WEB-INF/web.xml index e34b619d51..f93fd13e4d 100644 --- a/almanach/almanach-war/src/main/webapp/WEB-INF/web.xml +++ b/almanach/almanach-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanach.jsp b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanach.jsp index 08d70db388..6ec7e80ca0 100644 --- a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanach.jsp +++ b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanach.jsp @@ -1,5 +1,5 @@ <%@ page import="org.silverpeas.components.almanach.AlmanachSettings" %><%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="almanachCheck.jsp" %> diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachCheck.jsp b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachCheck.jsp index 195c0fe429..57747a53b4 100644 --- a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachCheck.jsp +++ b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachCheck.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <% response.setHeader("Cache-Control", "no-store"); //HTTP 1.1 diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceEdit.jsp b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceEdit.jsp index 1fdcb0c9b1..b322e45acd 100644 --- a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceEdit.jsp +++ b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceEdit.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="almanachCheck.jsp" %> diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceView.jsp b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceView.jsp index 22a32f82ce..9dbb1d4618 100644 --- a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceView.jsp +++ b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachOccurrenceView.jsp @@ -1,5 +1,5 @@ <%@ page import="org.silverpeas.core.admin.user.model.SilverpeasRole" %><%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="almanachCheck.jsp" %> diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachPortlet.jsp b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachPortlet.jsp index b9d6d65d85..bca9784de3 100644 --- a/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachPortlet.jsp +++ b/almanach/almanach-war/src/main/webapp/almanach/jsp/almanachPortlet.jsp @@ -1,5 +1,5 @@ <%@ page import="org.silverpeas.components.almanach.AlmanachSettings" %><%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="almanachCheck.jsp" %> diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/javaScript/angularjs/almanachcalendar.js b/almanach/almanach-war/src/main/webapp/almanach/jsp/javaScript/angularjs/almanachcalendar.js index da0d9c5435..9d5f0b6828 100644 --- a/almanach/almanach-war/src/main/webapp/almanach/jsp/javaScript/angularjs/almanachcalendar.js +++ b/almanach/almanach-war/src/main/webapp/almanach/jsp/javaScript/angularjs/almanachcalendar.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* The angularjs application with its dependencies */ diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/javaScript/angularjs/services/almanachcalendar.js b/almanach/almanach-war/src/main/webapp/almanach/jsp/javaScript/angularjs/services/almanachcalendar.js index 1ef96291e2..789f3f1c2d 100644 --- a/almanach/almanach-war/src/main/webapp/almanach/jsp/javaScript/angularjs/services/almanachcalendar.js +++ b/almanach/almanach-war/src/main/webapp/almanach/jsp/javaScript/angularjs/services/almanachcalendar.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ (function() { diff --git a/almanach/almanach-war/src/main/webapp/almanach/jsp/styleSheets/almanach.css b/almanach/almanach-war/src/main/webapp/almanach/jsp/styleSheets/almanach.css index 4ccc3250d8..505fff7052 100644 --- a/almanach/almanach-war/src/main/webapp/almanach/jsp/styleSheets/almanach.css +++ b/almanach/almanach-war/src/main/webapp/almanach/jsp/styleSheets/almanach.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,5 +19,5 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ \ No newline at end of file diff --git a/almanach/pom.xml b/almanach/pom.xml index b5de3d8728..ff638aee60 100644 --- a/almanach/pom.xml +++ b/almanach/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/blog/blog-configuration/pom.xml b/blog/blog-configuration/pom.xml index 22ac2af929..275a2505fa 100644 --- a/blog/blog-configuration/pom.xml +++ b/blog/blog-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>blog</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.blog</groupId> diff --git a/blog/blog-configuration/src/main/config/migrations/modules/blog-migration.xml b/blog/blog-configuration/src/main/config/migrations/modules/blog-migration.xml index c94dcf03f3..5652ff3f13 100644 --- a/blog/blog-configuration/src/main/config/migrations/modules/blog-migration.xml +++ b/blog/blog-configuration/src/main/config/migrations/modules/blog-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <migration module="blog" xmlns="http://silverpeas.org/xml/ns/migration" diff --git a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle.properties b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle.properties index 01a42f5314..061e60e5e4 100644 --- a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle.properties +++ b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # blog.newPost = Cr\u00e9er un nouveau billet blog.content = Contenu diff --git a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_de.properties b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_de.properties index f3d0a0baf2..edb3299385 100644 --- a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_de.properties +++ b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # blog.newPost = Erstellen eines neuen Beitrages blog.content = Inhalt diff --git a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_en.properties b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_en.properties index 74e680bb53..1676a6a9d2 100644 --- a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_en.properties +++ b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # blog.newPost = Create a post blog.content = Content diff --git a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_fr.properties b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_fr.properties index 01a42f5314..061e60e5e4 100644 --- a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_fr.properties +++ b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/multilang/blogBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # blog.newPost = Cr\u00e9er un nouveau billet blog.content = Contenu diff --git a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/settings/blogIcons.properties b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/settings/blogIcons.properties index 0915de4645..68c922fca5 100644 --- a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/settings/blogIcons.properties +++ b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/settings/blogIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # blog.logo = /blog/jsp/icons/logo.gif diff --git a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/settings/blogSettings.properties b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/settings/blogSettings.properties index a24a117994..7f2ccdab86 100644 --- a/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/settings/blogSettings.properties +++ b/blog/blog-configuration/src/main/config/properties/org/silverpeas/blog/settings/blogSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # templatePath=${env.SILVERPEAS_HOME}/resources/StringTemplates/components/blog/ diff --git a/blog/blog-configuration/src/main/config/properties/org/silverpeas/util/logging/blogLogging.properties b/blog/blog-configuration/src/main/config/properties/org/silverpeas/util/logging/blogLogging.properties index afd1d81047..c15e28876e 100644 --- a/blog/blog-configuration/src/main/config/properties/org/silverpeas/util/logging/blogLogging.properties +++ b/blog/blog-configuration/src/main/config/properties/org/silverpeas/util/logging/blogLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/blog/blog-configuration/src/main/config/xmlcomponents/blog.xml b/blog/blog-configuration/src/main/config/xmlcomponents/blog.xml index 82444b66ae..24986a554c 100644 --- a/blog/blog-configuration/src/main/config/xmlcomponents/blog.xml +++ b/blog/blog-configuration/src/main/config/xmlcomponents/blog.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/blog/blog-library/pom.xml b/blog/blog-library/pom.xml index 96e9fa692f..f90b95e530 100644 --- a/blog/blog-library/pom.xml +++ b/blog/blog-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>blog</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.blog</groupId> diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogContentManager.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogContentManager.java index 005c74e0b1..bbf59297a4 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogContentManager.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogInstancePostConstruction.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogInstancePostConstruction.java index be6b44a72e..be93c832e5 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogInstancePostConstruction.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogStatistics.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogStatistics.java index d67bc2c244..e7aead0e04 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogStatistics.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/BlogStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/dao/PostDAO.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/dao/PostDAO.java index d8d467d9ae..f53a3dffd3 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/dao/PostDAO.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/dao/PostDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.dao; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/Archive.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/Archive.java index 117f9b8441..198749ee8d 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/Archive.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/Archive.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.model; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/BlogRuntimeException.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/BlogRuntimeException.java index f61775e10f..39bf9216de 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/BlogRuntimeException.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/BlogRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.model; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/Category.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/Category.java index b4ada18955..692900ac7f 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/Category.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/Category.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.model; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/PostDetail.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/PostDetail.java index 0455244082..f1f88757f5 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/PostDetail.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/model/PostDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.model; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/AbstractBlogUserNotification.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/AbstractBlogUserNotification.java index f7e8f666e5..4d46abec23 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/AbstractBlogUserNotification.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/AbstractBlogUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.notification; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogInstanceManualUserNotification.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogInstanceManualUserNotification.java index a5ad2b8289..6eac487952 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogInstanceManualUserNotification.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.notification; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogUserAlertNotification.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogUserAlertNotification.java index d1fdaaf12a..13aa4a2b27 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogUserAlertNotification.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogUserAlertNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.notification; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogUserSubscriptionNotification.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogUserSubscriptionNotification.java index a72e1e653a..3408c3eba1 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogUserSubscriptionNotification.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/notification/BlogUserSubscriptionNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.notification; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/BlogService.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/BlogService.java index fce4dd57a9..2b7d3ebfaf 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/BlogService.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/BlogService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.service; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/BlogServiceFactory.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/BlogServiceFactory.java index 7a441e4506..47709ea952 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/BlogServiceFactory.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/BlogServiceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.service; diff --git a/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/DefaultBlogService.java b/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/DefaultBlogService.java index 52273121fc..1c61083766 100644 --- a/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/DefaultBlogService.java +++ b/blog/blog-library/src/main/java/org/silverpeas/components/blog/service/DefaultBlogService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.service; diff --git a/blog/blog-war/pom.xml b/blog/blog-war/pom.xml index 70e9b2a3c9..9e63f7ead0 100644 --- a/blog/blog-war/pom.xml +++ b/blog/blog-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>blog</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.blog</groupId> diff --git a/blog/blog-war/src/main/java/org/silverpeas/components/blog/BlogIndexer.java b/blog/blog-war/src/main/java/org/silverpeas/components/blog/BlogIndexer.java index 09688f416b..bac202393c 100644 --- a/blog/blog-war/src/main/java/org/silverpeas/components/blog/BlogIndexer.java +++ b/blog/blog-war/src/main/java/org/silverpeas/components/blog/BlogIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog; diff --git a/blog/blog-war/src/main/java/org/silverpeas/components/blog/access/BlogPostWriteAccessControl.java b/blog/blog-war/src/main/java/org/silverpeas/components/blog/access/BlogPostWriteAccessControl.java index c36b3e9c68..5db93569c9 100644 --- a/blog/blog-war/src/main/java/org/silverpeas/components/blog/access/BlogPostWriteAccessControl.java +++ b/blog/blog-war/src/main/java/org/silverpeas/components/blog/access/BlogPostWriteAccessControl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.access; diff --git a/blog/blog-war/src/main/java/org/silverpeas/components/blog/access/BlogPostWriteAccessController.java b/blog/blog-war/src/main/java/org/silverpeas/components/blog/access/BlogPostWriteAccessController.java index f9201c4da3..a68ac1996c 100644 --- a/blog/blog-war/src/main/java/org/silverpeas/components/blog/access/BlogPostWriteAccessController.java +++ b/blog/blog-war/src/main/java/org/silverpeas/components/blog/access/BlogPostWriteAccessController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.access; diff --git a/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/BlogSessionController.java b/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/BlogSessionController.java index 50b91a6585..b89b7b5400 100644 --- a/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/BlogSessionController.java +++ b/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/BlogSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.control; diff --git a/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/StyleSheet.java b/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/StyleSheet.java index 6f2e1247f8..41c2890efa 100644 --- a/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/StyleSheet.java +++ b/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/StyleSheet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.control; diff --git a/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/WallPaper.java b/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/WallPaper.java index 4477b62eff..fb11020c46 100644 --- a/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/WallPaper.java +++ b/blog/blog-war/src/main/java/org/silverpeas/components/blog/control/WallPaper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.control; diff --git a/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/BlogRequestRouter.java b/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/BlogRequestRouter.java index 986e458886..5eff0b7b67 100644 --- a/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/BlogRequestRouter.java +++ b/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/BlogRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.servlets; diff --git a/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/BlogRssServlet.java b/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/BlogRssServlet.java index 8ef886b6c1..1379796a74 100644 --- a/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/BlogRssServlet.java +++ b/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/BlogRssServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.servlets; diff --git a/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/GoToPost.java b/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/GoToPost.java index 7ae6ffaaa9..330f1e1f5d 100644 --- a/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/GoToPost.java +++ b/blog/blog-war/src/main/java/org/silverpeas/components/blog/servlets/GoToPost.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.blog.servlets; diff --git a/blog/blog-war/src/main/webapp/WEB-INF/web.xml b/blog/blog-war/src/main/webapp/WEB-INF/web.xml index f9b1ed680f..fb3afee7a2 100644 --- a/blog/blog-war/src/main/webapp/WEB-INF/web.xml +++ b/blog/blog-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/blog/blog-war/src/main/webapp/blog/jsp/accueil.jsp b/blog/blog-war/src/main/webapp/blog/jsp/accueil.jsp index cd024c9fee..b318492d80 100644 --- a/blog/blog-war/src/main/webapp/blog/jsp/accueil.jsp +++ b/blog/blog-war/src/main/webapp/blog/jsp/accueil.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/blog/blog-war/src/main/webapp/blog/jsp/check.jsp b/blog/blog-war/src/main/webapp/blog/jsp/check.jsp index bc78373afa..a296c323f1 100644 --- a/blog/blog-war/src/main/webapp/blog/jsp/check.jsp +++ b/blog/blog-war/src/main/webapp/blog/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/blog/blog-war/src/main/webapp/blog/jsp/portlet.jsp b/blog/blog-war/src/main/webapp/blog/jsp/portlet.jsp index 973af93eee..32bc076fd1 100644 --- a/blog/blog-war/src/main/webapp/blog/jsp/portlet.jsp +++ b/blog/blog-war/src/main/webapp/blog/jsp/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/blog/blog-war/src/main/webapp/blog/jsp/postManager.jsp b/blog/blog-war/src/main/webapp/blog/jsp/postManager.jsp index 6219ddec59..fe693c4a00 100644 --- a/blog/blog-war/src/main/webapp/blog/jsp/postManager.jsp +++ b/blog/blog-war/src/main/webapp/blog/jsp/postManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" diff --git a/blog/blog-war/src/main/webapp/blog/jsp/viewCategory.jsp b/blog/blog-war/src/main/webapp/blog/jsp/viewCategory.jsp index dd8eaaf26d..ce34a6c21f 100644 --- a/blog/blog-war/src/main/webapp/blog/jsp/viewCategory.jsp +++ b/blog/blog-war/src/main/webapp/blog/jsp/viewCategory.jsp @@ -2,7 +2,7 @@ <%@ page import="org.silverpeas.core.web.util.viewgenerator.html.icons.Icon" %> <%@ page import="org.silverpeas.core.util.WebEncodeHelper" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -14,7 +14,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +22,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/blog/blog-war/src/main/webapp/blog/jsp/viewPost.jsp b/blog/blog-war/src/main/webapp/blog/jsp/viewPost.jsp index a336375700..29390ecb66 100644 --- a/blog/blog-war/src/main/webapp/blog/jsp/viewPost.jsp +++ b/blog/blog-war/src/main/webapp/blog/jsp/viewPost.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/blog/pom.xml b/blog/pom.xml index 1e6db6370c..7268d4dd38 100644 --- a/blog/pom.xml +++ b/blog/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/classifieds/classifieds-configuration/pom.xml b/classifieds/classifieds-configuration/pom.xml index 7c4645afea..e03fdafd31 100644 --- a/classifieds/classifieds-configuration/pom.xml +++ b/classifieds/classifieds-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>classifieds</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.classifieds</groupId> diff --git a/classifieds/classifieds-configuration/src/main/config/migrations/modules/classifieds-migration.xml b/classifieds/classifieds-configuration/src/main/config/migrations/modules/classifieds-migration.xml index 5b45d260ce..67967691d7 100644 --- a/classifieds/classifieds-configuration/src/main/config/migrations/modules/classifieds-migration.xml +++ b/classifieds/classifieds-configuration/src/main/config/migrations/modules/classifieds-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="classifieds" diff --git a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle.properties b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle.properties index d3ba01b478..7cc48ff7f4 100644 --- a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle.properties +++ b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # classifieds.myClassifieds = Mes annonces classifieds.addClassified = Ajouter une annonce diff --git a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_de.properties b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_de.properties index 169c68941c..25b017e397 100644 --- a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_de.properties +++ b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # classifieds.redirect.next=Sie wurden auf die n\u00e4chste gerichtet. classifieds.myClassifieds = Meine Kleinanzeigen diff --git a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_en.properties b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_en.properties index 127a0f7479..2e31468365 100644 --- a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_en.properties +++ b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # classifieds.myClassifieds = My classifieds classifieds.addClassified = Add a classified diff --git a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_fr.properties b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_fr.properties index 3282be91fa..feb5e7643d 100644 --- a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_fr.properties +++ b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/multilang/classifiedsBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # classifieds.myClassifieds = Mes annonces classifieds.addClassified = Ajouter une annonce diff --git a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/settings/classifiedsIcons.properties b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/settings/classifiedsIcons.properties index fd7f1eb913..152129711f 100644 --- a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/settings/classifiedsIcons.properties +++ b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/settings/classifiedsIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # classifieds.logo = /classifieds/jsp/icons/logo.gif diff --git a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/settings/classifiedsSettings.properties b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/settings/classifiedsSettings.properties index 79be34a6f9..1adfaad638 100644 --- a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/settings/classifiedsSettings.properties +++ b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/classifieds/settings/classifiedsSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # date et heure de la suppression automatique des petites annonces arrivant � terme diff --git a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/util/logging/classifiedsLogging.properties b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/util/logging/classifiedsLogging.properties index ac68d057b5..776f7e6e75 100644 --- a/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/util/logging/classifiedsLogging.properties +++ b/classifieds/classifieds-configuration/src/main/config/properties/org/silverpeas/util/logging/classifiedsLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/classifieds/classifieds-configuration/src/main/config/xmlcomponents/classifieds.xml b/classifieds/classifieds-configuration/src/main/config/xmlcomponents/classifieds.xml index 9e7dc1ca59..6580ad953a 100644 --- a/classifieds/classifieds-configuration/src/main/config/xmlcomponents/classifieds.xml +++ b/classifieds/classifieds-configuration/src/main/config/xmlcomponents/classifieds.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <WAComponent xmlns="http://silverpeas.org/xml/ns/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/classifieds/classifieds-library/pom.xml b/classifieds/classifieds-library/pom.xml index 0c5c87ff82..a584d12926 100644 --- a/classifieds/classifieds-library/pom.xml +++ b/classifieds/classifieds-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>classifieds</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.classifieds</groupId> diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedUtil.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedUtil.java index 858e593678..3746d5f3b9 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedUtil.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsComponentSettings.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsComponentSettings.java index f924f53e9d..dde60188fe 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsComponentSettings.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsComponentSettings.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsInstancePreDestruction.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsInstancePreDestruction.java index 3b013d7f5c..3e66074c83 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsInstancePreDestruction.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsStatistics.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsStatistics.java index edb6f1a78d..5c44d11d0a 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsStatistics.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/ClassifiedsStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/dao/ClassifiedsDAO.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/dao/ClassifiedsDAO.java index 48adf5c3d2..4b2dc34ca1 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/dao/ClassifiedsDAO.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/dao/ClassifiedsDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.dao; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/Category.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/Category.java index c983139789..a54060d050 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/Category.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/Category.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.model; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/ClassifiedDetail.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/ClassifiedDetail.java index 7ae66f7b99..d9ead375b5 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/ClassifiedDetail.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/ClassifiedDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.model; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/ClassifiedsRuntimeException.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/ClassifiedsRuntimeException.java index b1a1f34b83..8e86fcdb46 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/ClassifiedsRuntimeException.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/ClassifiedsRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.model; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/Subscribe.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/Subscribe.java index d0c7c13c94..3a77818fa6 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/Subscribe.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/model/Subscribe.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.model; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/AbstractClassifiedUserNotification.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/AbstractClassifiedUserNotification.java index 39e7154961..7b46ec8789 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/AbstractClassifiedUserNotification.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/AbstractClassifiedUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.notification; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedOwnerNotification.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedOwnerNotification.java index 28331d0ebd..f138c6af0c 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedOwnerNotification.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedOwnerNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.notification; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSimpleNotification.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSimpleNotification.java index 2fdf0f8951..019e2b61ab 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSimpleNotification.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSimpleNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.notification; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSubscriptionUserNotification.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSubscriptionUserNotification.java index 38a9f09ab6..820d6118e8 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSubscriptionUserNotification.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSubscriptionUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.notification; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSupervisorUserNotification.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSupervisorUserNotification.java index ac0334e46a..1ac40cae38 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSupervisorUserNotification.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedSupervisorUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.notification; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedValidationUserNotification.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedValidationUserNotification.java index d8919f27ba..6e4b3200e4 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedValidationUserNotification.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedValidationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.notification; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ClassifiedService.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ClassifiedService.java index 7625575bcd..92da1eaa34 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ClassifiedService.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ClassifiedService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.service; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ClassifiedServiceProvider.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ClassifiedServiceProvider.java index d5025abb9b..04d636d11e 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ClassifiedServiceProvider.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ClassifiedServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.service; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/DefaultClassifiedService.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/DefaultClassifiedService.java index 7aaedcc0b1..3dc0e1063c 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/DefaultClassifiedService.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/DefaultClassifiedService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.service; diff --git a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ScheduledUnpublishExpiredClassifieds.java b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ScheduledUnpublishExpiredClassifieds.java index 53d1bb1133..ffab41b9dd 100644 --- a/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ScheduledUnpublishExpiredClassifieds.java +++ b/classifieds/classifieds-library/src/main/java/org/silverpeas/components/classifieds/service/ScheduledUnpublishExpiredClassifieds.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.service; diff --git a/classifieds/classifieds-war/pom.xml b/classifieds/classifieds-war/pom.xml index 3c5b147c5d..c9c24c9218 100644 --- a/classifieds/classifieds-war/pom.xml +++ b/classifieds/classifieds-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>classifieds</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.classifieds</groupId> diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/ClassifiedsIndexer.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/ClassifiedsIndexer.java index bde1f58d6d..12692e558c 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/ClassifiedsIndexer.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/ClassifiedsIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/ClassifiedsRole.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/ClassifiedsRole.java index 7f43dc0f24..8c09b342a5 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/ClassifiedsRole.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/ClassifiedsRole.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.control; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/ClassifiedsSessionController.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/ClassifiedsSessionController.java index 44c36d6ec8..c4ad9f00e7 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/ClassifiedsSessionController.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/ClassifiedsSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.control; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/SearchContext.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/SearchContext.java index f44289c7f6..0eb05ee68a 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/SearchContext.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/control/SearchContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.control; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedsInstanceManualUserNotification.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedsInstanceManualUserNotification.java index 1000089773..19a61b50f8 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedsInstanceManualUserNotification.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/notification/ClassifiedsInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.notification; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/ClassifiedsRequestRouter.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/ClassifiedsRequestRouter.java index 4ea7b7e5b6..d273bb6d71 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/ClassifiedsRequestRouter.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/ClassifiedsRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/FunctionHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/FunctionHandler.java index 48d305b375..16e1f4e492 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/FunctionHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/FunctionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedCreationFormHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedCreationFormHandler.java index 6c0c95cc7a..5914ef2fdb 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedCreationFormHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedCreationFormHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedCreationHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedCreationHandler.java index 8e678046bf..ad05edaa2d 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedCreationHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedCreationHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedDeleteHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedDeleteHandler.java index 8f0f80379d..f4e31a18f2 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedDeleteHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedOwnerNotificationHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedOwnerNotificationHandler.java index c62600a385..bf4338c04f 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedOwnerNotificationHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedOwnerNotificationHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedRefuseHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedRefuseHandler.java index da7f171d8a..5917ed2d57 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedRefuseHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedRefuseHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedUpdateFormHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedUpdateFormHandler.java index db2ca8a0cf..70711df1ef 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedUpdateFormHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedUpdateFormHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedUpdateHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedUpdateHandler.java index c491e894b0..67937db470 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedUpdateHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedUpdateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedValidateHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedValidateHandler.java index e00a824c75..6fd1aa65cf 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedValidateHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ClassifiedValidateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DefaultHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DefaultHandler.java index 2aaf56848a..af2ed897fe 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DefaultHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DefaultHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DraftInHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DraftInHandler.java index 74204a6d98..416c72f757 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DraftInHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DraftInHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DraftOutHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DraftOutHandler.java index 0e9410b3f0..4a1b7ab534 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DraftOutHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/DraftOutHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/HandlerProvider.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/HandlerProvider.java index 00d2ec7dc6..7f38830c08 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/HandlerProvider.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/HandlerProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ListToValidateHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ListToValidateHandler.java index 2ef35b1ac5..88f506fe5b 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ListToValidateHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ListToValidateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/MyClassifiedsHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/MyClassifiedsHandler.java index 30969b085b..604e25d3ad 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/MyClassifiedsHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/MyClassifiedsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/NextHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/NextHandler.java index ebdf5dbc11..f70fb89e91 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/NextHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/NextHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/PaginationHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/PaginationHandler.java index aa691e2ae3..07f39a6296 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/PaginationHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/PaginationHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -35,7 +35,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/PreviousHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/PreviousHandler.java index a130495536..13f002f07e 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/PreviousHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/PreviousHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SearchHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SearchHandler.java index 00039d7d9c..e0e7386b30 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SearchHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SearchHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SearchResultsHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SearchResultsHandler.java index 987e81f974..3275a4b7aa 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SearchResultsHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SearchResultsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionCreateFormHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionCreateFormHandler.java index 1460f13ea4..16c075799f 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionCreateFormHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionCreateFormHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionCreateHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionCreateHandler.java index f8cf9dbba5..78bc28b183 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionCreateHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionCreateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionDeleteHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionDeleteHandler.java index 8706f74e26..0ba2998ffa 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionDeleteHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionDeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionListHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionListHandler.java index 18d5fda1ff..bd654f2b9d 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionListHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/SubscriptionListHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ViewClassifiedHandler.java b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ViewClassifiedHandler.java index d0478e580c..812ed0bfb1 100644 --- a/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ViewClassifiedHandler.java +++ b/classifieds/classifieds-war/src/main/java/org/silverpeas/components/classifieds/servlets/handler/ViewClassifiedHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.classifieds.servlets.handler; diff --git a/classifieds/classifieds-war/src/main/webapp/WEB-INF/tags/silverpeas/classifieds/listOfClassifieds.tag b/classifieds/classifieds-war/src/main/webapp/WEB-INF/tags/silverpeas/classifieds/listOfClassifieds.tag index f9fdf05fcc..b64f3b6b50 100644 --- a/classifieds/classifieds-war/src/main/webapp/WEB-INF/tags/silverpeas/classifieds/listOfClassifieds.tag +++ b/classifieds/classifieds-war/src/main/webapp/WEB-INF/tags/silverpeas/classifieds/listOfClassifieds.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/classifieds/classifieds-war/src/main/webapp/WEB-INF/web.xml b/classifieds/classifieds-war/src/main/webapp/WEB-INF/web.xml index 7528baf617..93bb62673d 100644 --- a/classifieds/classifieds-war/src/main/webapp/WEB-INF/web.xml +++ b/classifieds/classifieds-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/accueil.jsp b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/accueil.jsp index 042ec15324..b00e75f248 100644 --- a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/accueil.jsp +++ b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/accueil.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.contribution.content.form.Form"%> diff --git a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/accueilNotCategorized.jsp b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/accueilNotCategorized.jsp index c57d8ed10c..d00be88027 100644 --- a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/accueilNotCategorized.jsp +++ b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/accueilNotCategorized.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.contribution.content.form.Form"%> diff --git a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifiedManager.jsp b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifiedManager.jsp index eef3740aeb..f4099ff9cf 100644 --- a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifiedManager.jsp +++ b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifiedManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifieds.jsp b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifieds.jsp index 4fb2bee4b1..2d985f1d13 100644 --- a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifieds.jsp +++ b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifieds.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifiedsResult.jsp b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifiedsResult.jsp index f19b57034d..40f8fd2adf 100644 --- a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifiedsResult.jsp +++ b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/classifiedsResult.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.classifieds.control.SearchContext"%> diff --git a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/styleSheets/classifieds.css b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/styleSheets/classifieds.css index 29f358b7fa..649bae02a8 100644 --- a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/styleSheets/classifieds.css +++ b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/styleSheets/classifieds.css @@ -1,5 +1,5 @@ /** -* Copyright (C) 2000 - 2020 Silverpeas +* Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: -* "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +* "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* along with this program. If not, see <https://www.gnu.org/licenses/>. */ #classifieds #search .forms.mode-search .fields { diff --git a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/subscriptionManager.jsp b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/subscriptionManager.jsp index 2e0c33175e..7702a643ea 100644 --- a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/subscriptionManager.jsp +++ b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/subscriptionManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/subscriptions.jsp b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/subscriptions.jsp index d3a5e9f944..10365ea095 100644 --- a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/subscriptions.jsp +++ b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/subscriptions.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/viewClassified.jsp b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/viewClassified.jsp index 69edfe6fb3..041207db97 100644 --- a/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/viewClassified.jsp +++ b/classifieds/classifieds-war/src/main/webapp/classifieds/jsp/viewClassified.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" diff --git a/classifieds/pom.xml b/classifieds/pom.xml index dbf9815c34..85da2c7b3a 100644 --- a/classifieds/pom.xml +++ b/classifieds/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/dataWarning/dataWarning-configuration/pom.xml b/dataWarning/dataWarning-configuration/pom.xml index 563d9c5e45..e5cfe93270 100644 --- a/dataWarning/dataWarning-configuration/pom.xml +++ b/dataWarning/dataWarning-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>datawarning</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.datawarning</groupId> diff --git a/dataWarning/dataWarning-configuration/src/main/config/migrations/modules/dataWarning-migration.xml b/dataWarning/dataWarning-configuration/src/main/config/migrations/modules/dataWarning-migration.xml index f7e401267c..52dcdbfbd9 100644 --- a/dataWarning/dataWarning-configuration/src/main/config/migrations/modules/dataWarning-migration.xml +++ b/dataWarning/dataWarning-configuration/src/main/config/migrations/modules/dataWarning-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <migration module="dataWarning" xmlns="http://silverpeas.org/xml/ns/migration" diff --git a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning.properties b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning.properties index 255fba2d71..d4ae91705c 100644 --- a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning.properties +++ b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # erreurParametresConnectionIncorrects = param\u00e8tres de connexion incorrects diff --git a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_de.properties b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_de.properties index 255fba2d71..d4ae91705c 100644 --- a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_de.properties +++ b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # erreurParametresConnectionIncorrects = param\u00e8tres de connexion incorrects diff --git a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_en.properties b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_en.properties index 8bd9f199ce..a1a3dcca01 100644 --- a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_en.properties +++ b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # parametresConnectionIncorrects = wrong connexion parameters diff --git a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_fr.properties b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_fr.properties index b5988b3437..9676b0540e 100644 --- a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_fr.properties +++ b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/multilang/dataWarning_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # erreurParametresConnectionIncorrects = param\u00e8tres de connexion incorrects diff --git a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningIcons.properties b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningIcons.properties index e3c24e2cc8..9c3c99130c 100644 --- a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningIcons.properties +++ b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # DataWarning.logo = /DataWarning/jsp/icons/logo.gif diff --git a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningSettings.properties b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningSettings.properties index b5bff9c92e..326d4c93f7 100644 --- a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningSettings.properties +++ b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # #Specify if the key ST_PASSWORD must be processed or not diff --git a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningSettings.xml b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningSettings.xml index 21dee3781b..738f536156 100644 --- a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningSettings.xml +++ b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/dataWarning/settings/dataWarningSettings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/util/logging/dataWarningLogging.properties b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/util/logging/dataWarningLogging.properties index d82ceb05d1..ebc8e09741 100644 --- a/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/util/logging/dataWarningLogging.properties +++ b/dataWarning/dataWarning-configuration/src/main/config/properties/org/silverpeas/util/logging/dataWarningLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/dataWarning/dataWarning-configuration/src/main/config/xmlcomponents/dataWarning.xml b/dataWarning/dataWarning-configuration/src/main/config/xmlcomponents/dataWarning.xml index 5b05af5a6d..36e3f2565a 100644 --- a/dataWarning/dataWarning-configuration/src/main/config/xmlcomponents/dataWarning.xml +++ b/dataWarning/dataWarning-configuration/src/main/config/xmlcomponents/dataWarning.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/dataWarning/dataWarning-library/pom.xml b/dataWarning/dataWarning-library/pom.xml index 92fa566c2a..519bc18a7e 100644 --- a/dataWarning/dataWarning-library/pom.xml +++ b/dataWarning/dataWarning-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>datawarning</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.datawarning</groupId> diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningDBDriver.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningDBDriver.java index 22f75d962e..9e3efff4fe 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningDBDriver.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningDBDriver.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningDBDrivers.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningDBDrivers.java index 2ee2992132..c7969b2d8c 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningDBDrivers.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningDBDrivers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningException.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningException.java index cf9ca302eb..392a8b771a 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningException.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInitialize.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInitialize.java index e35db101ed..451b2f117f 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInitialize.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInitialize.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInstancePostConstruction.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInstancePostConstruction.java index dc0a06971d..58031b423f 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInstancePostConstruction.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInstancePreDestruction.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInstancePreDestruction.java index f8036ea67b..b59ff2354f 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInstancePreDestruction.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningRuntimeException.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningRuntimeException.java index 7284c63d5b..fd3d5d80f6 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningRuntimeException.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/DataWarningRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarning.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarning.java index 1e0ed7771e..8bf00cc659 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarning.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarning.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.model; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningDataManager.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningDataManager.java index c5c1137f1b..fbb7eff7de 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningDataManager.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningDataManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.model; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningGroup.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningGroup.java index 65c7c6e0bd..fe32ff8020 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningGroup.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.model; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningQuery.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningQuery.java index 0c9fba9810..2cd62b8928 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningQuery.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningQuery.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.model; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningQueryResult.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningQueryResult.java index 7276744e39..59fc990ef0 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningQueryResult.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningQueryResult.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.model; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningResult.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningResult.java index a192a163b3..ccbb9391f9 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningResult.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningResult.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.model; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningScheduler.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningScheduler.java index abdd40c860..437112474b 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningScheduler.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.model; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningUser.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningUser.java index 10f278073b..52630d8470 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningUser.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/model/DataWarningUser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.model; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningEngine.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningEngine.java index a5d33a7fc4..82ab677947 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningEngine.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningEngine.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.service; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningSchedulerImpl.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningSchedulerImpl.java index 20119ee66d..539db86af5 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningSchedulerImpl.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningSchedulerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.service; diff --git a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningSchedulerTable.java b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningSchedulerTable.java index c9e4c134ab..fd313e9c28 100644 --- a/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningSchedulerTable.java +++ b/dataWarning/dataWarning-library/src/main/java/org/silverpeas/components/datawarning/service/DataWarningSchedulerTable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.service; diff --git a/dataWarning/dataWarning-war/pom.xml b/dataWarning/dataWarning-war/pom.xml index 50c960d7ff..b7121c03bc 100644 --- a/dataWarning/dataWarning-war/pom.xml +++ b/dataWarning/dataWarning-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>datawarning</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.datawarning</groupId> diff --git a/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/DataWarningIndexer.java b/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/DataWarningIndexer.java index 7badca4969..e217b24d47 100644 --- a/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/DataWarningIndexer.java +++ b/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/DataWarningIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/control/DataWarningSessionController.java b/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/control/DataWarningSessionController.java index b46a21553b..014acbf9cf 100644 --- a/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/control/DataWarningSessionController.java +++ b/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/control/DataWarningSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.control; diff --git a/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/servlets/DataWarningRequestRouter.java b/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/servlets/DataWarningRequestRouter.java index 18f9ea6222..c222349efa 100644 --- a/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/servlets/DataWarningRequestRouter.java +++ b/dataWarning/dataWarning-war/src/main/java/org/silverpeas/components/datawarning/servlets/DataWarningRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.datawarning.servlets; diff --git a/dataWarning/dataWarning-war/src/main/webapp/WEB-INF/web.xml b/dataWarning/dataWarning-war/src/main/webapp/WEB-INF/web.xml index e5e10ba79f..ca34d439f3 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/WEB-INF/web.xml +++ b/dataWarning/dataWarning-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/check.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/check.jsp index 9c8f65ed2f..8ab3aabc17 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/check.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/checkDataWarning.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/checkDataWarning.jsp index 2efc49599e..bb9d72c126 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/checkDataWarning.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/checkDataWarning.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/closeJsp.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/closeJsp.jsp index de90b20bc6..cc595cc32f 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/closeJsp.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/closeJsp.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/connectionParameters.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/connectionParameters.jsp index b85e28fdd6..38352db397 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/connectionParameters.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/connectionParameters.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/dataWarning.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/dataWarning.jsp index d69b6d1da3..4da52700ad 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/dataWarning.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/dataWarning.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editParamGen.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editParamGen.jsp index 5203b893ca..c732031134 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editParamGen.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editParamGen.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editParamGenQuery.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editParamGenQuery.jsp index 5640f52091..9487fc5c02 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editParamGenQuery.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editParamGenQuery.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editReqExpert.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editReqExpert.jsp index 0c4304bbbd..e0bfa9c2c5 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editReqExpert.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editReqExpert.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editSeuil.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editSeuil.jsp index 6599c6d852..521d7c829e 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editSeuil.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/editSeuil.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/export.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/export.jsp index 04e68e16bd..b72b681174 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/export.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/export.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/imports.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/imports.jsp index 709ed3b96c..94907f01e2 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/imports.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/imports.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/init.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/init.jsp index f0a632c86a..ef30ff421a 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/init.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/init.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/previewReq.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/previewReq.jsp index 97994cb2f4..674f3efe11 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/previewReq.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/previewReq.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/requestParameters.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/requestParameters.jsp index 8e2a2da604..98886cf8a0 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/requestParameters.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/requestParameters.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/schedulerParameters.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/schedulerParameters.jsp index eb7a00dac0..09341c43d2 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/schedulerParameters.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/schedulerParameters.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectAgrega.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectAgrega.jsp index 2e5a5bec0a..3fef7b38b0 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectAgrega.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectAgrega.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectColumns.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectColumns.jsp index b3f8317bb7..985a6a89fb 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectColumns.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectColumns.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectConstraints.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectConstraints.jsp index f9ffafc7cf..8586874679 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectConstraints.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectConstraints.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectTable.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectTable.jsp index 7ad1d3d5ff..596883820e 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectTable.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/selectTable.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/welcome.jsp b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/welcome.jsp index 7f6ebaf20e..869f2afd48 100644 --- a/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/welcome.jsp +++ b/dataWarning/dataWarning-war/src/main/webapp/dataWarning/jsp/welcome.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/dataWarning/pom.xml b/dataWarning/pom.xml index a4323d589a..426e09148d 100644 --- a/dataWarning/pom.xml +++ b/dataWarning/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/delegatednews/delegatednews-configuration/pom.xml b/delegatednews/delegatednews-configuration/pom.xml index 8bce05799f..a9eca221cf 100644 --- a/delegatednews/delegatednews-configuration/pom.xml +++ b/delegatednews/delegatednews-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>delegatednews</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.delegatednews</groupId> diff --git a/delegatednews/delegatednews-configuration/src/main/config/migrations/modules/delegatedNews-migration.xml b/delegatednews/delegatednews-configuration/src/main/config/migrations/modules/delegatedNews-migration.xml index 438a31904e..0f4b9b5ee2 100644 --- a/delegatednews/delegatednews-configuration/src/main/config/migrations/modules/delegatedNews-migration.xml +++ b/delegatednews/delegatednews-configuration/src/main/config/migrations/modules/delegatedNews-migration.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle.properties b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle.properties index 86f62fcb07..c1604473b6 100644 --- a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle.properties +++ b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # delegatednews.updateDate = Derni\u00e8re modification delegatednews.contributor = Contributeur diff --git a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_de.properties b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_de.properties index de93bc4bf3..dce37b1c14 100644 --- a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_de.properties +++ b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://repository.silverpeas.com/legal/licensing" +# "https://www.silverpeas.org/legal/licensing" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # delegatednews.updateDate = Datum der letzten \u00c4nderung delegatednews.contributor = Mitwirkender diff --git a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_en.properties b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_en.properties index 0217977094..b334657689 100644 --- a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_en.properties +++ b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://repository.silverpeas.com/legal/licensing" +# "https://www.silverpeas.org/legal/licensing" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # delegatednews.updateDate = Last update delegatednews.contributor = Contributor diff --git a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_fr.properties b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_fr.properties index 6014b05abc..ca432fbc52 100644 --- a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_fr.properties +++ b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/multilang/DelegatedNewsBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://repository.silverpeas.com/legal/licensing" +# "https://www.silverpeas.org/legal/licensing" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # delegatednews.updateDate = Derni\u00e8re modification delegatednews.contributor = Contributeur diff --git a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/settings/DelegatedNewsIcons.properties b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/settings/DelegatedNewsIcons.properties index 4a49c54b7c..54f80d7b2a 100644 --- a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/settings/DelegatedNewsIcons.properties +++ b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/settings/DelegatedNewsIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://repository.silverpeas.com/legal/licensing" +# "https://www.silverpeas.org/legal/licensing" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,6 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # delegatednews.icons.delete=../../util/icons/delete.gif \ No newline at end of file diff --git a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/settings/DelegatedNewsSettings.properties b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/settings/DelegatedNewsSettings.properties index 5281d4786b..716db77ec4 100644 --- a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/settings/DelegatedNewsSettings.properties +++ b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/delegatednews/settings/DelegatedNewsSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # templatePath=${env.SILVERPEAS_HOME}/resources/StringTemplates/components/delegatednews/ diff --git a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/util/logging/delegatednewsLogging.properties b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/util/logging/delegatednewsLogging.properties index 03cbb7e3c4..6d17c78c27 100644 --- a/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/util/logging/delegatednewsLogging.properties +++ b/delegatednews/delegatednews-configuration/src/main/config/properties/org/silverpeas/util/logging/delegatednewsLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/delegatednews/delegatednews-configuration/src/main/config/xmlcomponents/delegatednews.xml b/delegatednews/delegatednews-configuration/src/main/config/xmlcomponents/delegatednews.xml index b988046ae5..0e5f50e926 100644 --- a/delegatednews/delegatednews-configuration/src/main/config/xmlcomponents/delegatednews.xml +++ b/delegatednews/delegatednews-configuration/src/main/config/xmlcomponents/delegatednews.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/delegatednews/delegatednews-library/pom.xml b/delegatednews/delegatednews-library/pom.xml index f8f95622f8..5364bd2822 100644 --- a/delegatednews/delegatednews-library/pom.xml +++ b/delegatednews/delegatednews-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>delegatednews</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.delegatednews</groupId> diff --git a/delegatednews/delegatednews-library/src/integration-test/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsDaoIT.java b/delegatednews/delegatednews-library/src/integration-test/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsDaoIT.java index fc1c359c24..6065ab6d2e 100644 --- a/delegatednews/delegatednews-library/src/integration-test/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsDaoIT.java +++ b/delegatednews/delegatednews-library/src/integration-test/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsDaoIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.dao; diff --git a/delegatednews/delegatednews-library/src/integration-test/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceIT.java b/delegatednews/delegatednews-library/src/integration-test/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceIT.java index 5513a89da7..98d0f72c24 100644 --- a/delegatednews/delegatednews-library/src/integration-test/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceIT.java +++ b/delegatednews/delegatednews-library/src/integration-test/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/delegatednews/delegatednews-library/src/integration-test/resources/arquillian.xml b/delegatednews/delegatednews-library/src/integration-test/resources/arquillian.xml index fc68726bc5..ebca1fdd1e 100644 --- a/delegatednews/delegatednews-library/src/integration-test/resources/arquillian.xml +++ b/delegatednews/delegatednews-library/src/integration-test/resources/arquillian.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <arquillian xmlns="http://jboss.org/schema/arquillian" @@ -37,8 +37,8 @@ <container qualifier="wildfly-managed" default="true"> <configuration> <property name="serverConfig">standalone-full.xml</property> - <property name="startupTimeoutInSeconds">120</property> - <property name="allowConnectingToRunningServer">true</property> + <property name="startupTimeoutInSeconds">300</property> + <property name="allowConnectingToRunningServer">false</property> <property name="javaVmArguments">-Xms512M -Xmx2G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</property> <!-- uncomment it for debugging integration test --> <!-- @@ -46,4 +46,4 @@ --> </configuration> </container> -</arquillian> \ No newline at end of file +</arquillian> diff --git a/delegatednews/delegatednews-library/src/integration-test/resources/test-ds.xml b/delegatednews/delegatednews-library/src/integration-test/resources/test-ds.xml index eaddc0bfad..55db3df229 100644 --- a/delegatednews/delegatednews-library/src/integration-test/resources/test-ds.xml +++ b/delegatednews/delegatednews-library/src/integration-test/resources/test-ds.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <datasources xmlns="http://www.jboss.org/ironjacamar/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/DelegatedNewsRuntimeException.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/DelegatedNewsRuntimeException.java index ed5f8ce76a..95c460d061 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/DelegatedNewsRuntimeException.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/DelegatedNewsRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/DelegatedPublicationEventListener.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/DelegatedPublicationEventListener.java index da70480eb6..3c02dbe5e4 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/DelegatedPublicationEventListener.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/DelegatedPublicationEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsJpaRepository.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsJpaRepository.java index c873e0c0a1..5305509193 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsJpaRepository.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsJpaRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.dao; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsRepository.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsRepository.java index cd87d0ef28..3a34cc7f9e 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsRepository.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/dao/DelegatedNewsRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.dao; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/model/DelegatedNews.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/model/DelegatedNews.java index 1d9657df55..87a7971567 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/model/DelegatedNews.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/model/DelegatedNews.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.model; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/AbstractDelegatedNewsUserNotification.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/AbstractDelegatedNewsUserNotification.java index a77caf4284..d05f9c8dfc 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/AbstractDelegatedNewsUserNotification.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/AbstractDelegatedNewsUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.notification; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsDeniedNotification.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsDeniedNotification.java index 308698567f..52f09edfb8 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsDeniedNotification.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsDeniedNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.notification; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsToValidateNotification.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsToValidateNotification.java index 13a650abf6..8143cd0ef0 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsToValidateNotification.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsToValidateNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.notification; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsValidationNotification.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsValidationNotification.java index 7b7022177d..89ab12b885 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsValidationNotification.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/notification/DelegatedNewsValidationNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.notification; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsService.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsService.java index c6a8b5a91f..eadf7ee491 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsService.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.service; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceImpl.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceImpl.java index 99156ae945..483dd643b1 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceImpl.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.service; diff --git a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceProvider.java b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceProvider.java index 0816b2de6e..1ef45460b1 100644 --- a/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceProvider.java +++ b/delegatednews/delegatednews-library/src/main/java/org/silverpeas/components/delegatednews/service/DelegatedNewsServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.service; diff --git a/delegatednews/delegatednews-war/pom.xml b/delegatednews/delegatednews-war/pom.xml index 550a8d5f83..001c88dc9a 100644 --- a/delegatednews/delegatednews-war/pom.xml +++ b/delegatednews/delegatednews-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>delegatednews</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.delegatednews</groupId> diff --git a/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/DelegatednewsIndexer.java b/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/DelegatednewsIndexer.java index 0b330e7096..1bb65f2a16 100644 --- a/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/DelegatednewsIndexer.java +++ b/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/DelegatednewsIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews; diff --git a/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/control/DelegatedNewsSessionController.java b/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/control/DelegatedNewsSessionController.java index 1ef2d4b956..963ecdbece 100644 --- a/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/control/DelegatedNewsSessionController.java +++ b/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/control/DelegatedNewsSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.control; diff --git a/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/servlets/DelegatedNewsRequestRouter.java b/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/servlets/DelegatedNewsRequestRouter.java index b5fa76cffa..d4db17a5ef 100644 --- a/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/servlets/DelegatedNewsRequestRouter.java +++ b/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/servlets/DelegatedNewsRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.servlets; diff --git a/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/web/DelegatedNewsEntity.java b/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/web/DelegatedNewsEntity.java index fbc4686d2e..22eb77e6d5 100644 --- a/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/web/DelegatedNewsEntity.java +++ b/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/web/DelegatedNewsEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.web; diff --git a/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/web/ListDelegatedNewsResource.java b/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/web/ListDelegatedNewsResource.java index 49bdebc4d4..f3be5ae143 100644 --- a/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/web/ListDelegatedNewsResource.java +++ b/delegatednews/delegatednews-war/src/main/java/org/silverpeas/components/delegatednews/web/ListDelegatedNewsResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.delegatednews.web; diff --git a/delegatednews/delegatednews-war/src/main/webapp/WEB-INF/web.xml b/delegatednews/delegatednews-war/src/main/webapp/WEB-INF/web.xml index 165af7bacd..9495a47668 100644 --- a/delegatednews/delegatednews-war/src/main/webapp/WEB-INF/web.xml +++ b/delegatednews/delegatednews-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/delegatednews/delegatednews-war/src/main/webapp/delegatednews/jsp/check.jsp b/delegatednews/delegatednews-war/src/main/webapp/delegatednews/jsp/check.jsp index 27c879bc50..891f17f42a 100644 --- a/delegatednews/delegatednews-war/src/main/webapp/delegatednews/jsp/check.jsp +++ b/delegatednews/delegatednews-war/src/main/webapp/delegatednews/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/delegatednews/delegatednews-war/src/main/webapp/delegatednews/jsp/listNews.jsp b/delegatednews/delegatednews-war/src/main/webapp/delegatednews/jsp/listNews.jsp index 549f6bdfc0..5532c6202d 100644 --- a/delegatednews/delegatednews-war/src/main/webapp/delegatednews/jsp/listNews.jsp +++ b/delegatednews/delegatednews-war/src/main/webapp/delegatednews/jsp/listNews.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/delegatednews/pom.xml b/delegatednews/pom.xml index a2aff02f3d..46363c1293 100644 --- a/delegatednews/pom.xml +++ b/delegatednews/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/exceptions.txt b/exceptions.txt index 1d96c44961..a47ad083d3 100644 --- a/exceptions.txt +++ b/exceptions.txt @@ -81,9 +81,9 @@ Zope Public License 2.0 Due to the many variants of some of the above licenses, we require that any version follow the 2003 version of the Free Software Foundation's Free Software Definition - (http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of + (https://www.gnu.org/philosophy/free-sw.html) or version 1.9 of the Open Source Definition by the Open Source Initiative - (http://www.opensource.org/docs/definition.php). + (https://www.opensource.org/docs/definition.php). 3. Definitions diff --git a/formsOnline/formsOnline-configuration/pom.xml b/formsOnline/formsOnline-configuration/pom.xml index fb823eaa98..5c55d9b000 100644 --- a/formsOnline/formsOnline-configuration/pom.xml +++ b/formsOnline/formsOnline-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>formsonline</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.formsonline</groupId> diff --git a/formsOnline/formsOnline-configuration/src/main/config/migrations/modules/formsOnline-migration.xml b/formsOnline/formsOnline-configuration/src/main/config/migrations/modules/formsOnline-migration.xml index 8753cf9e42..441be6ccdd 100644 --- a/formsOnline/formsOnline-configuration/src/main/config/migrations/modules/formsOnline-migration.xml +++ b/formsOnline/formsOnline-configuration/src/main/config/migrations/modules/formsOnline-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> diff --git a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle.properties b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle.properties index 05db8d2ab3..665b43a1d9 100644 --- a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle.properties +++ b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # formsOnline.Form = Formulaire @@ -40,6 +40,7 @@ formsOnline.msgFormToValid = Vous avez une demande \u00e0 valider formsOnline.msgFormValidated = Votre demande a \u00e9t\u00e9 valid\u00e9e formsOnline.msgFormValidated.steps = ({0}/{1}) formsOnline.msgFormRefused = Votre demande a \u00e9t\u00e9 refus\u00e9e +formsOnline.msgFormProcessed = Une demande a \u00e9t\u00e9 trait\u00e9e formsOnline.notifLinkLabel = Voir cette demande formsOnline.msgFormCanceled = Une demande a \u00e9t\u00e9 annul\u00e9e diff --git a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_de.properties b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_de.properties index c178434f4c..ef7d62751a 100644 --- a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_de.properties +++ b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # formsOnline.Form = Formular @@ -34,6 +34,7 @@ formsOnline.msgFormToValid = Sie Haben eine Anfrage zu best\u00e4tigen formsOnline.msgFormValidated = Ihre Anfrage wurde best\u00e4tigt formsOnline.msgFormValidated.steps = ({0}/{1}) formsOnline.msgFormRefused = Ihre Anfrage wurde abgelehnt +formsOnline.msgFormProcessed = Eine Anfrage wurde bearbeitet formsOnline.notifLinkLabel = gehen Sie zu diese Anfrage formsOnline.msgFormCanceled = Eine Anfrage wurde storniert diff --git a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_en.properties b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_en.properties index f76553b1ca..1f8ce81593 100644 --- a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_en.properties +++ b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # formsOnline.Form = Form @@ -34,6 +34,7 @@ formsOnline.msgFormToValid = You have a request to validate formsOnline.msgFormValidated = Your request has been validated formsOnline.msgFormValidated.steps = ({0}/{1}) formsOnline.msgFormRefused = Your request has been denied +formsOnline.msgFormProcessed = A request has been processed formsOnline.notifLinkLabel = View this request formsOnline.msgFormCanceled = A request has been canceled diff --git a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_fr.properties b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_fr.properties index 05db8d2ab3..665b43a1d9 100644 --- a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_fr.properties +++ b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/multilang/formsOnlineBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # formsOnline.Form = Formulaire @@ -40,6 +40,7 @@ formsOnline.msgFormToValid = Vous avez une demande \u00e0 valider formsOnline.msgFormValidated = Votre demande a \u00e9t\u00e9 valid\u00e9e formsOnline.msgFormValidated.steps = ({0}/{1}) formsOnline.msgFormRefused = Votre demande a \u00e9t\u00e9 refus\u00e9e +formsOnline.msgFormProcessed = Une demande a \u00e9t\u00e9 trait\u00e9e formsOnline.notifLinkLabel = Voir cette demande formsOnline.msgFormCanceled = Une demande a \u00e9t\u00e9 annul\u00e9e diff --git a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/settings/formsOnlineIcons.properties b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/settings/formsOnlineIcons.properties index 105896e899..5a24c064c1 100644 --- a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/settings/formsOnlineIcons.properties +++ b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/settings/formsOnlineIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # formsOnline.logo = /formsOnline/jsp/icons/logo.gif diff --git a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/settings/formsOnlineSettings.properties b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/settings/formsOnlineSettings.properties index 0d2cfeccd4..919f82da6c 100644 --- a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/settings/formsOnlineSettings.properties +++ b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/formsonline/settings/formsOnlineSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,5 +19,5 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # diff --git a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/util/logging/formsOnlineLogging.properties b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/util/logging/formsOnlineLogging.properties index a49bf1d793..1091b885b0 100644 --- a/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/util/logging/formsOnlineLogging.properties +++ b/formsOnline/formsOnline-configuration/src/main/config/properties/org/silverpeas/util/logging/formsOnlineLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/formsOnline/formsOnline-configuration/src/main/config/resources/StringTemplates/components/formsonline/notificationProcessedOtherValidatorsSameLevel_de.st b/formsOnline/formsOnline-configuration/src/main/config/resources/StringTemplates/components/formsonline/notificationProcessedOtherValidatorsSameLevel_de.st new file mode 100644 index 0000000000..6eaa375222 --- /dev/null +++ b/formsOnline/formsOnline-configuration/src/main/config/resources/StringTemplates/components/formsonline/notificationProcessedOtherValidatorsSameLevel_de.st @@ -0,0 +1,12 @@ +$if(validation.validated)$ +I just accepted $requester.displayedName$'s request based on '$formName$'. +$endif$ +$if(validation.refused)$ +I just denied $requester.displayedName$'s request based on '$formName$'. +$endif$ +<br/> +Sie müssen nicht mehr eingreifen. +<br/> +$if(validation.comment)$ +<div style="background-color:#FFF9D7; border:1px solid #E2C822; padding:5px; width:390px;">$validation.comment$</div> +$endif$ \ No newline at end of file diff --git a/formsOnline/formsOnline-configuration/src/main/config/resources/StringTemplates/components/formsonline/notificationProcessedOtherValidatorsSameLevel_en.st b/formsOnline/formsOnline-configuration/src/main/config/resources/StringTemplates/components/formsonline/notificationProcessedOtherValidatorsSameLevel_en.st new file mode 100644 index 0000000000..70ef59f8c4 --- /dev/null +++ b/formsOnline/formsOnline-configuration/src/main/config/resources/StringTemplates/components/formsonline/notificationProcessedOtherValidatorsSameLevel_en.st @@ -0,0 +1,12 @@ +$if(validation.validated)$ +I just accepted $requester.displayedName$'s request based on '$formName$'. +$endif$ +$if(validation.refused)$ +I just denied $requester.displayedName$'s request based on '$formName$'. +$endif$ +<br/> +You no longer have to intervene. +<br/> +$if(validation.comment)$ +<div style="background-color:#FFF9D7; border:1px solid #E2C822; padding:5px; width:390px;">$validation.comment$</div> +$endif$ \ No newline at end of file diff --git a/formsOnline/formsOnline-configuration/src/main/config/resources/StringTemplates/components/formsonline/notificationProcessedOtherValidatorsSameLevel_fr.st b/formsOnline/formsOnline-configuration/src/main/config/resources/StringTemplates/components/formsonline/notificationProcessedOtherValidatorsSameLevel_fr.st new file mode 100644 index 0000000000..d72326cc21 --- /dev/null +++ b/formsOnline/formsOnline-configuration/src/main/config/resources/StringTemplates/components/formsonline/notificationProcessedOtherValidatorsSameLevel_fr.st @@ -0,0 +1,12 @@ +$if(validation.validated)$ +Je viens d'accepter la demande '$formName$' de $requester.displayedName$. +$endif$ +$if(validation.refused)$ +Je viens de refuser la demande '$formName$' de $requester.displayedName$. +$endif$ +<br/> +Vous n'avez plus à intervenir. +<br/> +$if(validation.comment)$ +<div style="background-color:#FFF9D7; border:1px solid #E2C822; padding:5px; width:390px;">$validation.comment$</div> +$endif$ \ No newline at end of file diff --git a/formsOnline/formsOnline-configuration/src/main/config/xmlcomponents/formsOnline.xml b/formsOnline/formsOnline-configuration/src/main/config/xmlcomponents/formsOnline.xml index f41a376a24..251afc0786 100644 --- a/formsOnline/formsOnline-configuration/src/main/config/xmlcomponents/formsOnline.xml +++ b/formsOnline/formsOnline-configuration/src/main/config/xmlcomponents/formsOnline.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/formsOnline/formsOnline-library/pom.xml b/formsOnline/formsOnline-library/pom.xml index 5410ab5336..a86d3e8765 100644 --- a/formsOnline/formsOnline-library/pom.xml +++ b/formsOnline/formsOnline-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>formsonline</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.formsonline</groupId> diff --git a/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/AbstractFormsOnlineIT.java b/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/AbstractFormsOnlineIT.java index a117a106d5..5488870e3a 100644 --- a/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/AbstractFormsOnlineIT.java +++ b/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/AbstractFormsOnlineIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/FormsOnlineDAOJdbcIT.java b/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/FormsOnlineDAOJdbcIT.java index e1c94a7408..06cf76b63d 100644 --- a/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/FormsOnlineDAOJdbcIT.java +++ b/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/FormsOnlineDAOJdbcIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/FormsOnlineServiceTestIT.java b/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/FormsOnlineServiceTestIT.java index 53accab3e9..5b1ad9bf6d 100644 --- a/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/FormsOnlineServiceTestIT.java +++ b/formsOnline/formsOnline-library/src/integration-test/java/org/silverpeas/components/formsonline/model/FormsOnlineServiceTestIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/integration-test/resources/arquillian.xml b/formsOnline/formsOnline-library/src/integration-test/resources/arquillian.xml index fc68726bc5..ebca1fdd1e 100644 --- a/formsOnline/formsOnline-library/src/integration-test/resources/arquillian.xml +++ b/formsOnline/formsOnline-library/src/integration-test/resources/arquillian.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <arquillian xmlns="http://jboss.org/schema/arquillian" @@ -37,8 +37,8 @@ <container qualifier="wildfly-managed" default="true"> <configuration> <property name="serverConfig">standalone-full.xml</property> - <property name="startupTimeoutInSeconds">120</property> - <property name="allowConnectingToRunningServer">true</property> + <property name="startupTimeoutInSeconds">300</property> + <property name="allowConnectingToRunningServer">false</property> <property name="javaVmArguments">-Xms512M -Xmx2G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</property> <!-- uncomment it for debugging integration test --> <!-- @@ -46,4 +46,4 @@ --> </configuration> </container> -</arquillian> \ No newline at end of file +</arquillian> diff --git a/formsOnline/formsOnline-library/src/integration-test/resources/test-ds.xml b/formsOnline/formsOnline-library/src/integration-test/resources/test-ds.xml index eaddc0bfad..55db3df229 100644 --- a/formsOnline/formsOnline-library/src/integration-test/resources/test-ds.xml +++ b/formsOnline/formsOnline-library/src/integration-test/resources/test-ds.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <datasources xmlns="http://www.jboss.org/ironjacamar/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/FormsOnlineComponentSettings.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/FormsOnlineComponentSettings.java index 5e4b2f5946..60721ffff3 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/FormsOnlineComponentSettings.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/FormsOnlineComponentSettings.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/FormsOnlineInstancePreDestruction.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/FormsOnlineInstancePreDestruction.java index dc36dbd5fb..34c918f9ea 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/FormsOnlineInstancePreDestruction.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/FormsOnlineInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/DefaultFormsOnlineService.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/DefaultFormsOnlineService.java index dccb99e5ba..9d6a22777c 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/DefaultFormsOnlineService.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/DefaultFormsOnlineService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; @@ -29,6 +29,9 @@ import org.silverpeas.components.formsonline.notification.FormsOnlineCanceledRequestUserNotification; import org.silverpeas.components.formsonline.notification.FormsOnlinePendingValidationRequestUserNotification; import org.silverpeas.components.formsonline.notification.FormsOnlineProcessedRequestFollowingUserNotification; + +import org.silverpeas.components.formsonline.notification + .FormsOnlineProcessedRequestOtherValidatorsUserNotification; import org.silverpeas.components.formsonline.notification.FormsOnlineProcessedRequestUserNotification; import org.silverpeas.components.formsonline.notification.FormsOnlineValidationRequestUserNotification; import org.silverpeas.core.admin.PaginationPage; @@ -643,10 +646,16 @@ private void notifyValidation(FormInstance request) { : NotifAction.VALIDATE; // notify sender buildAndSend(new FormsOnlineValidationRequestUserNotification(request, action)); - // notify the request processed + // notify next validators the request is processed buildAndSend(new FormsOnlineProcessedRequestUserNotification(request, action)); // notify validator followers of the processed request buildAndSend(new FormsOnlineProcessedRequestFollowingUserNotification(request, action)); + if (StringUtil.getBooleanValue(organizationController + .getComponentParameterValue(request.getComponentInstanceId(), + FormsOnlineComponentSettings.PARAM_WORKGROUP))) { + // notify other validators of this validation level that the request has been processed + buildAndSend(new FormsOnlineProcessedRequestOtherValidatorsUserNotification(request, action)); + } } @Override @@ -788,12 +797,15 @@ private Pair<String, List<SimpleDocument>> prepareMailContents(final FormInstanc final Map<String, String> values = dataRecord.getValues(I18NHelper.defaultLanguage); for (final FieldTemplate field : fields) { final String value = values.get(field.getFieldName()); - content.addElement(field.getLabel(I18NHelper.defaultLanguage)); - content.addElement(" : "); - content.addElement(value); - content.addElement(new BR()); - if (StringUtil.isDefined(value) && field.getTypeName().equals(FileField.TYPE)) { - docs.addAll(getFiles(dataRecord, field, request.getComponentInstanceId())); + if (StringUtil.isDefined(value)) { + // only defined fields are sent + content.addElement(field.getLabel(I18NHelper.defaultLanguage)); + content.addElement(" : "); + content.addElement(value); + content.addElement(new BR()); + if (field.getTypeName().equals(FileField.TYPE)) { + docs.addAll(getFiles(dataRecord, field, request.getComponentInstanceId())); + } } } return Pair.of(content.toString(), docs); diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormDetail.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormDetail.java index 60bc5d924d..939fa0a19f 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormDetail.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstance.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstance.java index 15f7e49373..710c88101b 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstance.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstance.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidation.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidation.java index 7bc2234d95..8eaedb61d0 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidation.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidationType.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidationType.java index fd4d7dcd1b..0ef9f4a53c 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidationType.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidationType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidations.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidations.java index 26b399d929..73b020470c 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidations.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormInstanceValidations.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormPK.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormPK.java index 3690e252cf..69701fe751 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormPK.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormPK.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineDAO.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineDAO.java index 427e25bc1b..d0f339adab 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineDAO.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General License for more details. * * You should have received a copy of the GNU Affero General License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineDAOJdbc.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineDAOJdbc.java index 382d8a2cd8..2bfc4d56fb 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineDAOJdbc.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineDAOJdbc.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineException.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineException.java index 9a9f6923f2..de744b54f8 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineException.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineService.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineService.java index c90feeb318..d48fff3692 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineService.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestCriteria.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestCriteria.java index 6466adb668..081364ee24 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestCriteria.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestCriteria.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestPK.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestPK.java index 44b212afad..4c482c9c91 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestPK.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestPK.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestValidationCriteria.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestValidationCriteria.java index bcd5eedcc3..d68ca69ac9 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestValidationCriteria.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestValidationCriteria.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestsByStatus.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestsByStatus.java index b12e0772df..5b79a3a41b 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestsByStatus.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/RequestsByStatus.java @@ -6,10 +6,11 @@ import org.silverpeas.core.util.SilverpeasArrayList; import org.silverpeas.core.util.SilverpeasList; -import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.function.BiConsumer; @@ -94,7 +95,6 @@ public class RequestsByStatus { new MergeRuleByStates(asList(STATE_UNREAD, STATE_READ), RequestsByStatus::addToValidate)); static final List<ValidationMergeRuleByStates> VALIDATION_MERGING_RULES_BY_STATES = asList( - new ValidationMergeRuleByStates(singletonList(STATE_DRAFT), skipValidationCriteriaIfLastValidatorConfigurer, RequestsByStatus::addDraft), new ValidationMergeRuleByStates(singletonList(STATE_REFUSED), skipValidationCriteriaIfLastValidatorConfigurer, RequestsByStatus::addDenied), new ValidationMergeRuleByStates(singletonList(STATE_VALIDATED), skipValidationCriteriaIfLastValidatorConfigurer, RequestsByStatus::addValidated), new ValidationMergeRuleByStates(singletonList(STATE_ARCHIVED), skipValidationCriteriaIfLastValidatorConfigurer, RequestsByStatus::addArchived), @@ -251,20 +251,22 @@ private void resetAll() { @SafeVarargs private final SilverpeasList<FormInstance> merge(final SilverpeasList<FormInstance>... lists) { int size = 0; - int maxSize = 0; + long maxSize = 0; for (SilverpeasList<FormInstance> list : lists) { size += list.size(); maxSize += list.originalListSize(); } - final List<FormInstance> merge = new ArrayList<>(size); + final Map<String, FormInstance> merge = new HashMap<>(size); for (SilverpeasList<FormInstance> list : lists) { - merge.addAll(list); + for (FormInstance formInstance : list) { + merge.putIfAbsent(formInstance.getId(), formInstance); + } } - Stream<FormInstance> resultStream = merge.stream().sorted(FORM_INSTANCE_COMPARATOR); + Stream<FormInstance> resultStream = merge.values().stream().sorted(FORM_INSTANCE_COMPARATOR); if (paginationPage != null) { resultStream = resultStream.limit(paginationPage.getPageSize()); } - return PaginationList.from(resultStream.collect(Collectors.toList()), maxSize); + return PaginationList.from(resultStream.collect(Collectors.toList()), maxSize - (size - merge.values().size())); } public static class MergeRuleByStates { @@ -301,4 +303,4 @@ Set<FormInstanceValidationType>>, RequestValidationCriteria> getValidationCriter return validationCriteriaConfigurer; } } -} \ No newline at end of file +} diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineFormUserNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineFormUserNotification.java index 787d7e83f3..f71728e5c6 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineFormUserNotification.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineFormUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.notification; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineProcessedRequestUserNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineProcessedRequestUserNotification.java new file mode 100644 index 0000000000..5e0ba9cbfc --- /dev/null +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineProcessedRequestUserNotification.java @@ -0,0 +1,61 @@ +package org.silverpeas.components.formsonline.notification; + +import org.silverpeas.components.formsonline.model.FormInstance; +import org.silverpeas.core.admin.user.model.Group; +import org.silverpeas.core.admin.user.model.User; +import org.silverpeas.core.notification.user.client.constant.NotifAction; +import org.silverpeas.core.template.SilverpeasTemplate; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static java.util.Collections.emptyList; + +public abstract class AbstractFormsOnlineProcessedRequestUserNotification + extends FormsOnlineValidationRequestUserNotification { + + private List<String> usersToBeNotified = new ArrayList<>(); + private List<String> groupsToBeNotified = new ArrayList<>(); + + protected AbstractFormsOnlineProcessedRequestUserNotification(final FormInstance resource, + final NotifAction action) { + super(resource, action); + } + + @Override + protected Collection<String> getUserIdsToNotify() { + return usersToBeNotified; + } + + @Override + protected Collection<String> getGroupIdsToNotify() { + return groupsToBeNotified; + } + + @Override + protected void performTemplateData(final String language, final FormInstance resource, + final SilverpeasTemplate template) { + super.performTemplateData(language, resource, template); + getResource().getValidations().getLatestValidation() + .ifPresent(v -> template.setAttribute("validation", v)); + + } + + protected void setUserIdsToNotify(List<User> users) { + if (users == null) { + this.usersToBeNotified = emptyList(); + } else { + this.usersToBeNotified = extractUserIds(users); + } + } + + protected void setGroupIdsToNotify(List<Group> groups) { + if (groups == null) { + this.groupsToBeNotified = emptyList(); + } else { + this.groupsToBeNotified = extractGroupIds(groups); + } + } + +} diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineRequestUserNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineRequestUserNotification.java index f6bf9af8ee..9e9f673107 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineRequestUserNotification.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/AbstractFormsOnlineRequestUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.notification; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineCanceledRequestUserNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineCanceledRequestUserNotification.java index e2580bfc69..a3e0d206bb 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineCanceledRequestUserNotification.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineCanceledRequestUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.notification; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineInstanceManualUserNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineInstanceManualUserNotification.java index b0c2a3532a..0f1b4468e0 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineInstanceManualUserNotification.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.notification; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlinePendingValidationRequestUserNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlinePendingValidationRequestUserNotification.java index bd37e492d0..1809538da4 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlinePendingValidationRequestUserNotification.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlinePendingValidationRequestUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.notification; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestFollowingUserNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestFollowingUserNotification.java index f1713f7dfd..5e361c1c8b 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestFollowingUserNotification.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestFollowingUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.notification; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestOtherValidatorsUserNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestOtherValidatorsUserNotification.java new file mode 100644 index 0000000000..5dba4a177d --- /dev/null +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestOtherValidatorsUserNotification.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2000 - 2024 Silverpeas + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * As a special exception to the terms and conditions of version 3.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * Open Source Software ("FLOSS") applications as described in Silverpeas's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * "https://www.silverpeas.org/legal/floss_exception.html" + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ +package org.silverpeas.components.formsonline.notification; + +import org.silverpeas.components.formsonline.model.FormInstance; +import org.silverpeas.components.formsonline.model.FormInstanceValidation; +import org.silverpeas.core.notification.user.client.constant.NotifAction; + +import java.util.Optional; + +/** + * @author Nicolas EYSSERIC + */ +public class FormsOnlineProcessedRequestOtherValidatorsUserNotification + extends AbstractFormsOnlineProcessedRequestUserNotification { + + public FormsOnlineProcessedRequestOtherValidatorsUserNotification(final FormInstance resource, + final NotifAction action) { + super(resource, action); + Optional<FormInstanceValidation> latestValidation = resource.getValidations().getLatestValidation(); + if (latestValidation.isPresent()) { + if (latestValidation.get().getValidationType().isFinal()) { + setUserIdsToNotify(resource.getForm().getReceiversAsUsers()); + setGroupIdsToNotify(resource.getForm().getReceiversAsGroups()); + } else if (latestValidation.get().getValidationType().isIntermediate()) { + setUserIdsToNotify(resource.getForm().getIntermediateReceiversAsUsers()); + setGroupIdsToNotify(resource.getForm().getIntermediateReceiversAsGroups()); + } + } + } + + @Override + protected String getBundleSubjectKey() { + return "formsOnline.msgFormProcessed"; + } + + @Override + protected String getTemplateFileName() { + return "notificationProcessedOtherValidatorsSameLevel"; + } + +} \ No newline at end of file diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestUserNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestUserNotification.java index edb51a20ec..3b89ebb382 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestUserNotification.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineProcessedRequestUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.notification; @@ -27,13 +27,9 @@ import org.silverpeas.components.formsonline.model.FormInstanceValidation; import org.silverpeas.components.formsonline.model.FormInstanceValidationType; import org.silverpeas.core.notification.user.client.constant.NotifAction; -import org.silverpeas.core.template.SilverpeasTemplate; -import java.util.Collection; -import java.util.List; import java.util.Optional; -import static java.util.Collections.emptyList; import static java.util.Optional.ofNullable; import static org.silverpeas.core.notification.user.client.constant.NotifAction.VALIDATE; @@ -41,10 +37,7 @@ * @author Nicolas EYSSERIC */ public class FormsOnlineProcessedRequestUserNotification - extends FormsOnlineValidationRequestUserNotification { - - private final List<String> usersToBeNotified; - private final List<String> groupsToBeNotified; + extends AbstractFormsOnlineProcessedRequestUserNotification { public FormsOnlineProcessedRequestUserNotification(final FormInstance resource, final NotifAction action) { @@ -53,23 +46,17 @@ public FormsOnlineProcessedRequestUserNotification(final FormInstance resource, .filter(v -> VALIDATE == action) .map(FormInstanceValidation::getValidationType); if (pendingValidation.filter(FormInstanceValidationType::isFinal).isPresent()) { - this.usersToBeNotified = extractUserIds(resource.getForm().getReceiversAsUsers()); - this.groupsToBeNotified = extractGroupIds(resource.getForm().getReceiversAsGroups()); + setUserIdsToNotify(resource.getForm().getReceiversAsUsers()); + setGroupIdsToNotify(resource.getForm().getReceiversAsGroups()); } else if (pendingValidation.filter(FormInstanceValidationType::isIntermediate).isPresent()) { - this.usersToBeNotified = extractUserIds(resource.getForm().getIntermediateReceiversAsUsers()); - this.groupsToBeNotified = extractGroupIds(resource.getForm().getIntermediateReceiversAsGroups()); + setUserIdsToNotify(resource.getForm().getIntermediateReceiversAsUsers()); + setGroupIdsToNotify(resource.getForm().getIntermediateReceiversAsGroups()); } else { - this.usersToBeNotified = emptyList(); - this.groupsToBeNotified = emptyList(); + setUserIdsToNotify(null); + setGroupIdsToNotify(null); } } - @Override - protected void perform(final FormInstance resource) { - super.perform(resource); - getNotificationMetaData().displayReceiversInFooter(); - } - @Override protected String getBundleSubjectKey() { return "formsOnline.msgFormToValid"; @@ -80,24 +67,6 @@ protected String getTemplateFileName() { return "notificationProcessed"; } - @Override - protected Collection<String> getUserIdsToNotify() { - return usersToBeNotified; - } - - @Override - protected Collection<String> getGroupIdsToNotify() { - return groupsToBeNotified; - } - - @Override - protected void performTemplateData(final String language, final FormInstance resource, - final SilverpeasTemplate template) { - super.performTemplateData(language, resource, template); - getResource().getValidations().getLatestValidation() - .ifPresent(v -> template.setAttribute("validation", v)); - } - /** * The meaning of the returned step number is "TO VALIDATE". * @return the next step number as integer. diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineUserAlertNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineUserAlertNotification.java index 3ab10bec77..332541b673 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineUserAlertNotification.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineUserAlertNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.notification; diff --git a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineValidationRequestUserNotification.java b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineValidationRequestUserNotification.java index 35ca2dd0fc..44f2c3d7d0 100644 --- a/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineValidationRequestUserNotification.java +++ b/formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/notification/FormsOnlineValidationRequestUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.notification; diff --git a/formsOnline/formsOnline-library/src/test/java/org/silverpeas/components/formsonline/model/FormDetailTest.java b/formsOnline/formsOnline-library/src/test/java/org/silverpeas/components/formsonline/model/FormDetailTest.java index c6954b795f..7dd58c4345 100644 --- a/formsOnline/formsOnline-library/src/test/java/org/silverpeas/components/formsonline/model/FormDetailTest.java +++ b/formsOnline/formsOnline-library/src/test/java/org/silverpeas/components/formsonline/model/FormDetailTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-library/src/test/java/org/silverpeas/components/formsonline/model/RequestsByStatusTest.java b/formsOnline/formsOnline-library/src/test/java/org/silverpeas/components/formsonline/model/RequestsByStatusTest.java index 2ce69bb3f7..2ae467e4ff 100644 --- a/formsOnline/formsOnline-library/src/test/java/org/silverpeas/components/formsonline/model/RequestsByStatusTest.java +++ b/formsOnline/formsOnline-library/src/test/java/org/silverpeas/components/formsonline/model/RequestsByStatusTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.model; diff --git a/formsOnline/formsOnline-war/pom.xml b/formsOnline/formsOnline-war/pom.xml index 47efda0ba4..adb6c8c9d6 100644 --- a/formsOnline/formsOnline-war/pom.xml +++ b/formsOnline/formsOnline-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>formsonline</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.formsonline</groupId> diff --git a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/FormsOnlineIndexer.java b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/FormsOnlineIndexer.java index 158f8870e3..b12f23f20f 100644 --- a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/FormsOnlineIndexer.java +++ b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/FormsOnlineIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline; diff --git a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/FormsOnlineSessionController.java b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/FormsOnlineSessionController.java index 90ca4ef7fa..c5e8bb38c6 100644 --- a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/FormsOnlineSessionController.java +++ b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/FormsOnlineSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.control; diff --git a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/RequestUIEntity.java b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/RequestUIEntity.java index b7acd98905..09fcd68574 100644 --- a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/RequestUIEntity.java +++ b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/RequestUIEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.control; diff --git a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/TitleHelper.java b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/TitleHelper.java index cc79c53368..01a8be9944 100644 --- a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/TitleHelper.java +++ b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/TitleHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.control; diff --git a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/servlets/FormsOnlineRequestRouter.java b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/servlets/FormsOnlineRequestRouter.java index 81106e7518..cf3a1e17a9 100644 --- a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/servlets/FormsOnlineRequestRouter.java +++ b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/servlets/FormsOnlineRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.servlets; diff --git a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/servlets/GoToForm.java b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/servlets/GoToForm.java index 0d4f6498d4..715fd145cb 100644 --- a/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/servlets/GoToForm.java +++ b/formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/servlets/GoToForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.formsonline.servlets; diff --git a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/hierarchicalInfo.tag b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/hierarchicalInfo.tag index 3cf7a55874..3aa71e05d7 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/hierarchicalInfo.tag +++ b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/hierarchicalInfo.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/myRequestsByState.tag b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/myRequestsByState.tag index 482c6244a8..2b998ac025 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/myRequestsByState.tag +++ b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/myRequestsByState.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validation.tag b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validation.tag index 843d568844..354dcbed07 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validation.tag +++ b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validation.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validations.tag b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validations.tag index 5b6086fced..7687017cb4 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validations.tag +++ b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validations.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validationsSchemaImage.tag b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validationsSchemaImage.tag index 285cb6a44f..ff439012d4 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validationsSchemaImage.tag +++ b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/tags/silverpeas/formsOnline/validationsSchemaImage.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/web.xml b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/web.xml index d6d79f323a..58ad779025 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/web.xml +++ b/formsOnline/formsOnline-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/editForm.jsp b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/editForm.jsp index 8b0ea2b159..68fd6d05b2 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/editForm.jsp +++ b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/editForm.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/editFormInstance.jsp b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/editFormInstance.jsp index 8a810f7fe3..6777037d86 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/editFormInstance.jsp +++ b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/editFormInstance.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> @@ -44,6 +44,7 @@ // context creation PagesContext context = (PagesContext) request.getAttribute("FormContext"); + context.setFormName("newInstanceForm"); %> <fmt:message var="deletionConfirmMessage" key="formsOnline.request.action.delete.confirm"/> @@ -109,4 +110,4 @@ </view:window> <view:progressMessage/> </view:sp-body-part> -</view:sp-page> \ No newline at end of file +</view:sp-page> diff --git a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/formsList.jsp b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/formsList.jsp index d53831b8bc..90c118c918 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/formsList.jsp +++ b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/formsList.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/inbox.jsp b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/inbox.jsp index 5cb4d824e4..9b0334575d 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/inbox.jsp +++ b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/inbox.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.components.formsonline.control.RequestUIEntity" %> diff --git a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/newFormInstance.jsp b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/newFormInstance.jsp index 5d39949690..5bf91765f8 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/newFormInstance.jsp +++ b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/newFormInstance.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/preview.jsp b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/preview.jsp index 5a13b7c888..a05f664615 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/preview.jsp +++ b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/preview.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/styleSheets/formsOnline-print.css b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/styleSheets/formsOnline-print.css index 41fe63c22f..7fe72eb4c5 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/styleSheets/formsOnline-print.css +++ b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/styleSheets/formsOnline-print.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://repository.silverpeas.com/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ .ask-by .forms { display:block; diff --git a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/styleSheets/formsOnline.css b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/styleSheets/formsOnline.css index 4807f20dc8..eed6a95d44 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/styleSheets/formsOnline.css +++ b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/styleSheets/formsOnline.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://repository.silverpeas.com/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ fieldset { margin-top: 10px; diff --git a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/viewInstance.jsp b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/viewInstance.jsp index 2b5514e071..fb186af9ea 100644 --- a/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/viewInstance.jsp +++ b/formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/viewInstance.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/formsOnline/pom.xml b/formsOnline/pom.xml index 639afdabbc..31f3b97dba 100644 --- a/formsOnline/pom.xml +++ b/formsOnline/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/forums/forums-configuration/pom.xml b/forums/forums-configuration/pom.xml index 94f505aef2..650035cecf 100644 --- a/forums/forums-configuration/pom.xml +++ b/forums/forums-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>forums</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.forums</groupId> diff --git a/forums/forums-configuration/src/main/config/migrations/modules/forums-migration.xml b/forums/forums-configuration/src/main/config/migrations/modules/forums-migration.xml index 13f886504e..c6f550e814 100644 --- a/forums/forums-configuration/src/main/config/migrations/modules/forums-migration.xml +++ b/forums/forums-configuration/src/main/config/migrations/modules/forums-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle.properties b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle.properties index 1d0db6b8cd..46f8893227 100644 --- a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle.properties +++ b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # forums = Forums accueil = Accueil diff --git a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_de.properties b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_de.properties index 3f20893ad0..d82b0e7453 100644 --- a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_de.properties +++ b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # forums = Foren diff --git a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_en.properties b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_en.properties index 2b5683faed..fde63f374b 100644 --- a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_en.properties +++ b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # forums = Forums accueil = Homepage diff --git a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_fr.properties b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_fr.properties index 889c4d628a..1401846f8a 100644 --- a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_fr.properties +++ b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/multilang/forumsBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # forums = Forums accueil = Accueil diff --git a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsIcons.properties b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsIcons.properties index 1053ff8faa..af674a8e9a 100644 --- a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsIcons.properties +++ b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # forums.delete = /util/icons/publicationDelete.gif forums.smallDelete = /util/icons/delete.gif diff --git a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsMails.properties b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsMails.properties index 99fa8071fb..236074bd21 100644 --- a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsMails.properties +++ b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsMails.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # forums.message.link = /Rforums/{componentId}/searchResult?Type=Message&Id={messageId} \ No newline at end of file diff --git a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsSettings.properties b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsSettings.properties index 9805b6478f..d09540939d 100644 --- a/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsSettings.properties +++ b/forums/forums-configuration/src/main/config/properties/org/silverpeas/forums/settings/forumsSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # beginHour = 8 endHour = 20 diff --git a/forums/forums-configuration/src/main/config/properties/org/silverpeas/util/logging/forumsLogging.properties b/forums/forums-configuration/src/main/config/properties/org/silverpeas/util/logging/forumsLogging.properties index 47c80a36f3..30da509d77 100644 --- a/forums/forums-configuration/src/main/config/properties/org/silverpeas/util/logging/forumsLogging.properties +++ b/forums/forums-configuration/src/main/config/properties/org/silverpeas/util/logging/forumsLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/forums/forums-configuration/src/main/config/xmlcomponents/forums.xml b/forums/forums-configuration/src/main/config/xmlcomponents/forums.xml index 77a57ede62..53920d9def 100644 --- a/forums/forums-configuration/src/main/config/xmlcomponents/forums.xml +++ b/forums/forums-configuration/src/main/config/xmlcomponents/forums.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/forums/forums-library/pom.xml b/forums/forums-library/pom.xml index dc9e967f2d..a024c576b5 100644 --- a/forums/forums-library/pom.xml +++ b/forums/forums-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>forums</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.forums</groupId> diff --git a/forums/forums-library/src/integration-test/java/org/silverpeas/components/forums/ForumsInstancePreDestructionIT.java b/forums/forums-library/src/integration-test/java/org/silverpeas/components/forums/ForumsInstancePreDestructionIT.java index a24139aee3..11f77e0a2b 100644 --- a/forums/forums-library/src/integration-test/java/org/silverpeas/components/forums/ForumsInstancePreDestructionIT.java +++ b/forums/forums-library/src/integration-test/java/org/silverpeas/components/forums/ForumsInstancePreDestructionIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums; diff --git a/forums/forums-library/src/integration-test/java/org/silverpeas/components/forums/test/WarBuilder4Forums.java b/forums/forums-library/src/integration-test/java/org/silverpeas/components/forums/test/WarBuilder4Forums.java index fced60a10b..e8135f067c 100644 --- a/forums/forums-library/src/integration-test/java/org/silverpeas/components/forums/test/WarBuilder4Forums.java +++ b/forums/forums-library/src/integration-test/java/org/silverpeas/components/forums/test/WarBuilder4Forums.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.test; diff --git a/forums/forums-library/src/integration-test/resources/arquillian.xml b/forums/forums-library/src/integration-test/resources/arquillian.xml index fc68726bc5..ebca1fdd1e 100644 --- a/forums/forums-library/src/integration-test/resources/arquillian.xml +++ b/forums/forums-library/src/integration-test/resources/arquillian.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <arquillian xmlns="http://jboss.org/schema/arquillian" @@ -37,8 +37,8 @@ <container qualifier="wildfly-managed" default="true"> <configuration> <property name="serverConfig">standalone-full.xml</property> - <property name="startupTimeoutInSeconds">120</property> - <property name="allowConnectingToRunningServer">true</property> + <property name="startupTimeoutInSeconds">300</property> + <property name="allowConnectingToRunningServer">false</property> <property name="javaVmArguments">-Xms512M -Xmx2G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</property> <!-- uncomment it for debugging integration test --> <!-- @@ -46,4 +46,4 @@ --> </configuration> </container> -</arquillian> \ No newline at end of file +</arquillian> diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsContentManager.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsContentManager.java index aa5117aa01..b0e0231194 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsContentManager.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsInstancePreDestruction.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsInstancePreDestruction.java index 8cb47ba0a1..874a07ba23 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsInstancePreDestruction.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsStatistics.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsStatistics.java index 0e42ab9673..d8f1ae8c3a 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsStatistics.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/ForumsStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /*--- formatted by Jindent 2.1, (www.c-lab.de/~jindent) diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Forum.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Forum.java index 546559992b..4ddd7ae898 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Forum.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Forum.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.model; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumDetail.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumDetail.java index fc88ed427c..eb4e2ee2a6 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumDetail.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.model; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumPK.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumPK.java index 3e3fd458f5..06f23a81a5 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumPK.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumPK.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.model; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumPath.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumPath.java index 3ad5f1bd7c..aebc4c9762 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumPath.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/ForumPath.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.model; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Message.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Message.java index 2f0ee2b0d0..9dfdede412 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Message.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Message.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.model; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/MessagePK.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/MessagePK.java index b061e21631..407228ad3a 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/MessagePK.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/MessagePK.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.model; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/MessagePath.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/MessagePath.java index 2b413b9599..19d3fda4b5 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/MessagePath.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/MessagePath.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.model; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Moderator.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Moderator.java index 3c8fdbaf5d..21bab7fd6a 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Moderator.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/model/Moderator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.model; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsForumUserNotification.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsForumUserNotification.java index 824f4af21b..08a3fc5d48 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsForumUserNotification.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsForumUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.notification; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsMessageUserNotification.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsMessageUserNotification.java index ce3ee500b4..f13735a26d 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsMessageUserNotification.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsMessageUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.notification; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsUserNotification.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsUserNotification.java index 9401f65614..892d6cc547 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsUserNotification.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/AbstractForumsUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.notification; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsForumSubscriptionUserNotification.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsForumSubscriptionUserNotification.java index ea655c92f9..bea3c39e24 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsForumSubscriptionUserNotification.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsForumSubscriptionUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.notification; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessagePendingValidationUserNotification.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessagePendingValidationUserNotification.java index d4fe40a44e..9fcf64bfa3 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessagePendingValidationUserNotification.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessagePendingValidationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.notification; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessageSubscriptionUserNotification.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessageSubscriptionUserNotification.java index 183ce606a2..30807e7fa3 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessageSubscriptionUserNotification.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessageSubscriptionUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.notification; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessageValidationUserNotification.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessageValidationUserNotification.java index 5aa9a011d0..13edda86ad 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessageValidationUserNotification.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/notification/ForumsMessageValidationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.notification; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/DefaultForumService.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/DefaultForumService.java index 6af9777084..4627040c83 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/DefaultForumService.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/DefaultForumService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.service; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumService.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumService.java index a1803fcf36..e829a81da5 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumService.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.service; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsDAO.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsDAO.java index 897998ad89..aae4757a9c 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsDAO.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.service; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsException.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsException.java index 3667d23d68..363864f8a2 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsException.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.service; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsRuntimeException.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsRuntimeException.java index d4ba2a8dc1..84b359b36a 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsRuntimeException.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.service; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsServiceProvider.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsServiceProvider.java index b9c9adc170..956b39e166 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsServiceProvider.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/service/ForumsServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.service; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumMessageSubscription.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumMessageSubscription.java index 268f159fa1..e2c873c73e 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumMessageSubscription.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumMessageSubscription.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.subscription; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumMessageSubscriptionResource.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumMessageSubscriptionResource.java index b5c9efc443..1d60fff969 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumMessageSubscriptionResource.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumMessageSubscriptionResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.subscription; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscription.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscription.java index 6b7dc850ac..cf77020b0e 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscription.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscription.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.subscription; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscriptionConstants.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscriptionConstants.java index 9ec4a9d712..939617a934 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscriptionConstants.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscriptionConstants.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.subscription; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscriptionResource.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscriptionResource.java index 036872c4cb..acb8f540e9 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscriptionResource.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumSubscriptionResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.subscription; diff --git a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumsSubscriptionService.java b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumsSubscriptionService.java index fe7fbf4c7f..b25fd9ca50 100644 --- a/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumsSubscriptionService.java +++ b/forums/forums-library/src/main/java/org/silverpeas/components/forums/subscription/ForumsSubscriptionService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.subscription; diff --git a/forums/forums-war/pom.xml b/forums/forums-war/pom.xml index 16c1011c4c..83f6b2a72a 100644 --- a/forums/forums-war/pom.xml +++ b/forums/forums-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>forums</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.forums</groupId> diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/ForumsIndexer.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/ForumsIndexer.java index 1afe06c559..dfd974960f 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/ForumsIndexer.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/ForumsIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/bean/ForumModeratorBean.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/bean/ForumModeratorBean.java index b3146299ed..aba1d7201b 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/bean/ForumModeratorBean.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/bean/ForumModeratorBean.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.bean; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/ForumsSessionController.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/ForumsSessionController.java index 39b84897c2..542c0ab408 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/ForumsSessionController.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/ForumsSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.control; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumActionHelper.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumActionHelper.java index 9ec003c289..c17f80147f 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumActionHelper.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumActionHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.control.helpers; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumHelper.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumHelper.java index bcd8d70ad2..12a4925c6d 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumHelper.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.control.helpers; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumListHelper.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumListHelper.java index 4f58c734be..511f88d252 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumListHelper.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/control/helpers/ForumListHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.control.helpers; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/ForumsRequestRouter.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/ForumsRequestRouter.java index f9b5fc7178..e126e95020 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/ForumsRequestRouter.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/ForumsRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.servlets; @@ -185,6 +185,17 @@ public String getDestination(String function, ForumsSessionController forumsSC, destination = URLUtil.getURL(forumsSC.getSpaceId(), forumsSC.getComponentId()) + "viewForum.jsp?call=main&forumId=" + id; } + } else if (function.startsWith("GoToFilesTab")) { + String messageId = request.getParameter("Id"); + Message message = null; + if (StringUtil.isDefined(messageId)) { + message = forumsSC.getMessage(Integer.parseInt(messageId)); + } + if (message == null) { + return ROOT_DEST + "messageNotFound"; + } + destination = URLUtil.getURL(forumsSC.getSpaceId(), forumsSC.getComponentId()) + + "viewMessage.jsp?action=1¶ms=" + messageId; } else { destination = ROOT_DEST + function; } diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/ForumsRssServlet.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/ForumsRssServlet.java index ac8ea22174..09e920f2f6 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/ForumsRssServlet.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/ForumsRssServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.servlets; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/GoToMessage.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/GoToMessage.java index a2f2a10c2a..3708a6d493 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/GoToMessage.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/servlets/GoToMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.servlets; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumMessageSubscriptionBean.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumMessageSubscriptionBean.java index 99ebee3115..8404b9e80d 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumMessageSubscriptionBean.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumMessageSubscriptionBean.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.subscription.bean; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumSubscriptionBean.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumSubscriptionBean.java index d4e94bae9e..45b5970cfc 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumSubscriptionBean.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumSubscriptionBean.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.subscription.bean; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumsSubscriptionBeanService.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumsSubscriptionBeanService.java index e1972c9cb8..61fe03c6c3 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumsSubscriptionBeanService.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/subscription/bean/ForumsSubscriptionBeanService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.subscription.bean; diff --git a/forums/forums-war/src/main/java/org/silverpeas/components/forums/url/ActionUrl.java b/forums/forums-war/src/main/java/org/silverpeas/components/forums/url/ActionUrl.java index eb057c98e3..733c0c21b9 100644 --- a/forums/forums-war/src/main/java/org/silverpeas/components/forums/url/ActionUrl.java +++ b/forums/forums-war/src/main/java/org/silverpeas/components/forums/url/ActionUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.forums.url; diff --git a/forums/forums-war/src/main/webapp/WEB-INF/web.xml b/forums/forums-war/src/main/webapp/WEB-INF/web.xml index f995a155ce..4c98efe35b 100644 --- a/forums/forums-war/src/main/webapp/WEB-INF/web.xml +++ b/forums/forums-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/forums/forums-war/src/main/webapp/forums/jsp/categoryManager.jsp b/forums/forums-war/src/main/webapp/forums/jsp/categoryManager.jsp index 92fc961d13..cb4f8ab416 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/categoryManager.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/categoryManager.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.node.model.NodeDetail" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/forums/forums-war/src/main/webapp/forums/jsp/checkForums.jsp b/forums/forums-war/src/main/webapp/forums/jsp/checkForums.jsp index daedec57e8..327f3abe39 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/checkForums.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/checkForums.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/forums/forums-war/src/main/webapp/forums/jsp/editForumInfo.jsp b/forums/forums-war/src/main/webapp/forums/jsp/editForumInfo.jsp index cbf31a3f64..41f48fa9fb 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/editForumInfo.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/editForumInfo.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/forums/forums-war/src/main/webapp/forums/jsp/editMessage.jsp b/forums/forums-war/src/main/webapp/forums/jsp/editMessage.jsp index e195a873bd..5bbd218900 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/editMessage.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/editMessage.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> @@ -162,12 +162,13 @@ function validateMessage() { $(document.forumsForm).submit(); } } +<% } %> function cancel() { sp.editor.wysiwyg.lastBackupManager.clear(); sp.formRequest('${pageScope.backURL}').submit(); } -<% } %> + </script> </head> <body <%addBodyOnload(out, fsc, (move ? "" : "init();"));%>> @@ -277,4 +278,4 @@ function cancel() { out.println(window.printAfter()); %> </body> -</html> \ No newline at end of file +</html> diff --git a/forums/forums-war/src/main/webapp/forums/jsp/editMessageKeywords.jsp b/forums/forums-war/src/main/webapp/forums/jsp/editMessageKeywords.jsp index fc38556596..6c19bf8bef 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/editMessageKeywords.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/editMessageKeywords.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.forums.control.helpers.ForumListHelper"%> diff --git a/forums/forums-war/src/main/webapp/forums/jsp/javaScript/viewMessage.js b/forums/forums-war/src/main/webapp/forums/jsp/javaScript/viewMessage.js index cab588435b..2ca7be7715 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/javaScript/viewMessage.js +++ b/forums/forums-war/src/main/webapp/forums/jsp/javaScript/viewMessage.js @@ -15,6 +15,7 @@ function replyMessage(messageId) { scrollMessageList(messageId); document.location.href = "#msg" + messageId; callResizeFrame(); + scrollToItem($('fieldset#message')); } function cancelMessage() { diff --git a/forums/forums-war/src/main/webapp/forums/jsp/main.jsp b/forums/forums-war/src/main/webapp/forums/jsp/main.jsp index 8c0e9f7f7e..c7dda55290 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/main.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/main.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <% diff --git a/forums/forums-war/src/main/webapp/forums/jsp/modifyMessage.jsp b/forums/forums-war/src/main/webapp/forums/jsp/modifyMessage.jsp index 03ba600c74..05ce7f1001 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/modifyMessage.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/modifyMessage.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.forums.control.helpers.ForumListHelper"%> diff --git a/forums/forums-war/src/main/webapp/forums/jsp/portlet.jsp b/forums/forums-war/src/main/webapp/forums/jsp/portlet.jsp index 3fbe20537a..82cbf25575 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/portlet.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.forums.control.helpers.ForumListHelper"%> diff --git a/forums/forums-war/src/main/webapp/forums/jsp/refuseMessage.jsp b/forums/forums-war/src/main/webapp/forums/jsp/refuseMessage.jsp index 46586c30cc..4a62fbfd16 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/refuseMessage.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/refuseMessage.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.forums.control.helpers.ForumListHelper" %> diff --git a/forums/forums-war/src/main/webapp/forums/jsp/styleSheets/forums.css b/forums/forums-war/src/main/webapp/forums/jsp/styleSheets/forums.css index 7a57be4eae..413bbf7195 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/styleSheets/forums.css +++ b/forums/forums-war/src/main/webapp/forums/jsp/styleSheets/forums.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/forums/forums-war/src/main/webapp/forums/jsp/viewForum.jsp b/forums/forums-war/src/main/webapp/forums/jsp/viewForum.jsp index 08d9d68c22..b03a818455 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/viewForum.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/viewForum.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <% diff --git a/forums/forums-war/src/main/webapp/forums/jsp/viewMessage.jsp b/forums/forums-war/src/main/webapp/forums/jsp/viewMessage.jsp index 656026188c..5f27b157bb 100644 --- a/forums/forums-war/src/main/webapp/forums/jsp/viewMessage.jsp +++ b/forums/forums-war/src/main/webapp/forums/jsp/viewMessage.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.forums.control.helpers.ForumHelper"%> @@ -54,6 +54,7 @@ <%@ page import="org.silverpeas.core.admin.user.model.User" %> <%@ page import="org.silverpeas.core.web.http.HttpRequest" %> <%@ page import="org.silverpeas.core.admin.user.model.SilverpeasRole" %> +<%@ page import="org.silverpeas.core.util.logging.SilverLogger" %> <%@ include file="checkForums.jsp"%> <% int messageId = 0; @@ -157,7 +158,7 @@ } } catch (NumberFormatException nfe) { - SilverTrace.info("forums", "JSPviewMessage", "root.EX_NO_MESSAGE", null, nfe); + SilverLogger.getLogger("silverpeas.components.forums").info(nfe.getMessage()); } String backURL = ActionUrl.getUrl(call, -1, forumId); @@ -419,14 +420,11 @@ <c:param name="params"><%=currentMessage.getId()%></c:param> <c:param name="forumId"><%=currentMessage.getForumId()%></c:param> </c:url> - <c:import url="/attachment/jsp/displayAttachedFiles.jsp"> - <c:param name="Id"><%=currentMessage.getId()%></c:param> - <c:param name="Profile" value="${profile}" /> - <c:param name="ComponentId"><%=instanceId%></c:param> - <c:param name="Context" value="${'attachment'}" /> - <c:param name="addFileMenu" value="${'true'}" /> - <c:param name="CallbackUrl" value="${callBackUrl}" /> - </c:import> + <viewTags:displayAttachments componentInstanceId="<%=instanceId%>" + resourceType="<%=currentMessage.RESOURCE_TYPE%>" + resourceId="<%=String.valueOf(currentMessage.getId())%>" + highestUserRole="<%=SilverpeasRole.from(profile)%>" + reloadCallbackUrl="${callBackUrl}"/> </div> <%=text%> <viewTags:viewAttachmentsAsContent componentInstanceId="${componentId}" @@ -460,7 +458,8 @@ </div> </div> <br clear="all"/> - </div><% + </div> + <% } @@ -527,7 +526,6 @@ <script type="text/javascript"> jQuery(document).ready(function() { init(); - scrollMessageList(<%=messageId%>); <% if (displayAllMessages && scrollToMessage) {%> scrollMessage(<%=messageId%>); <% } %> diff --git a/forums/pom.xml b/forums/pom.xml index bca7c0c0e2..d3b7fac9b0 100644 --- a/forums/pom.xml +++ b/forums/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/gallery/gallery-configuration/pom.xml b/gallery/gallery-configuration/pom.xml index a141747701..de909ad92d 100644 --- a/gallery/gallery-configuration/pom.xml +++ b/gallery/gallery-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>gallery</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.gallery</groupId> diff --git a/gallery/gallery-configuration/src/main/config/migrations/modules/gallery-migration.xml b/gallery/gallery-configuration/src/main/config/migrations/modules/gallery-migration.xml index f640b71d27..164f8c7bb8 100644 --- a/gallery/gallery-configuration/src/main/config/migrations/modules/gallery-migration.xml +++ b/gallery/gallery-configuration/src/main/config/migrations/modules/gallery-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="gallery" diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle.properties index 8b472c7a38..7881f94786 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.addAlbum = Cr\u00e9er un album gallery.addSubAlbum = Cr\u00e9er un sous album diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_de.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_de.properties index ae22d346bc..b076f621cd 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_de.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.addAlbum = Ein Album hinzuf\u00fcgen gallery.addSubAlbum = Ein Sub-Album hinzuf\u00fcgen diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_en.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_en.properties index 67dde778c4..59e8557a68 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_en.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.addAlbum = Create an album gallery.addSubAlbum = Create a sub album diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_fr.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_fr.properties index 053f5d50e8..fcd990b69f 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_fr.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/galleryBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.addAlbum = Cr\u00e9er un album gallery.addSubAlbum = Cr\u00e9er un sous album diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle.properties index 553c1d980d..ac79de570f 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.model = Mod\u00E8le gallery.dataTime = Date de prise de vue diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_de.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_de.properties index cbcc455e7d..d4b0909b24 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_de.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_de.properties @@ -1 +1 @@ -# # Copyright (C) 2000 - 2020 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # # As a special exception to the terms and conditions of version 3.0 of # the GPL, you may redistribute this Program in connection with Free/Libre # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: # "http://www.silverpeas.org/docs/core/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # gallery.model = Modell gallery.dataTime = Schnapsdatum gallery.xResolution = Horizontale Aufl\u00F6sung gallery.yResolution = Vertikale Aufl\u00F6sung gallery.resolutionUnit = EinHeit Aufl\u00F6sung gallery.winAuthor = (Windows) Autor gallery.winComment = (Windows) Kommentare gallery.winKeywords = (Windows) Schl\u00FCsselw\u00F6rter gallery.winSubject = (Windows) Subjekt gallery.winTitle = (Windows) Titel gallery.iptcCredit = Kredit gallery.iptcAuthor = Autor gallery.iptc592 = Sch\u00F6pfer gallery.iptc597 = Titel des Autors gallery.iptc632 = Legende gallery.iptc527 = Kategorie gallery.iptc602 = Stadt gallery.iptc628 = Copyright gallery.iptc613 = Land gallery.iptc567 = Aufnahmedatum gallery.iptc617 = Titel gallery.iptc537 = Schl\u00FCsselw\u00F6rter gallery.iptc517 = Objekt gallery.iptc615 = Sendung Reference gallery.iptc577 = Anwendung gallery.iptc607 = Provinz oder Staat gallery.iptc512 = Version gallery.iptc542 = Erscheinungsdatum gallery.iptc547 = R\u00FCckfallzeit gallery.iptc627 = Quelle gallery.iptc552 = Besondere Anweisungen gallery.iptc532 = Schwarz wei\u00DF Referenz gallery.iptc572 = Zeit erstellt gallery.iptc522 = Priorit\u00E4t \ No newline at end of file +# # Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # # As a special exception to the terms and conditions of version 3.0 of # the GPL, you may redistribute this Program in connection with Free/Libre # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: # "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.model = Modell gallery.dataTime = Schnapsdatum gallery.xResolution = Horizontale Aufl\u00F6sung gallery.yResolution = Vertikale Aufl\u00F6sung gallery.resolutionUnit = EinHeit Aufl\u00F6sung gallery.winAuthor = (Windows) Autor gallery.winComment = (Windows) Kommentare gallery.winKeywords = (Windows) Schl\u00FCsselw\u00F6rter gallery.winSubject = (Windows) Subjekt gallery.winTitle = (Windows) Titel gallery.iptcCredit = Kredit gallery.iptcAuthor = Autor gallery.iptc592 = Sch\u00F6pfer gallery.iptc597 = Titel des Autors gallery.iptc632 = Legende gallery.iptc527 = Kategorie gallery.iptc602 = Stadt gallery.iptc628 = Copyright gallery.iptc613 = Land gallery.iptc567 = Aufnahmedatum gallery.iptc617 = Titel gallery.iptc537 = Schl\u00FCsselw\u00F6rter gallery.iptc517 = Objekt gallery.iptc615 = Sendung Reference gallery.iptc577 = Anwendung gallery.iptc607 = Provinz oder Staat gallery.iptc512 = Version gallery.iptc542 = Erscheinungsdatum gallery.iptc547 = R\u00FCckfallzeit gallery.iptc627 = Quelle gallery.iptc552 = Besondere Anweisungen gallery.iptc532 = Schwarz wei\u00DF Referenz gallery.iptc572 = Zeit erstellt gallery.iptc522 = Priorit\u00E4t \ No newline at end of file diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_en.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_en.properties index 8129f4cc4e..82f86ab707 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_en.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.model = Model gallery.dataTime = Shot date diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_fr.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_fr.properties index 553c1d980d..ac79de570f 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_fr.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/multilang/metadataBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.model = Mod\u00E8le gallery.dataTime = Date de prise de vue diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/galleryIcons.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/galleryIcons.properties index 7c5520fc55..64786ea646 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/galleryIcons.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/galleryIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.mandatory = /util/icons/mandatoryField.gif diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/gallerySettings.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/gallerySettings.properties index 371549db58..6a40ceeefa 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/gallerySettings.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/gallerySettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # imagesSubDirectory = image diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/metadataSettings.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/metadataSettings.properties index 9f5d1d1cac..340fb812a2 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/metadataSettings.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/metadataSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # imagesSubDirectory = image diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/metadataSettings_galleryXXX.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/metadataSettings_galleryXXX.properties index 7263e773c5..dc2a78919f 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/metadataSettings_galleryXXX.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/gallery/settings/metadataSettings_galleryXXX.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # display = IPTC_11,IPTC_8 diff --git a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/util/logging/galleryLogging.properties b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/util/logging/galleryLogging.properties index dfa4cc6636..09d51b604d 100644 --- a/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/util/logging/galleryLogging.properties +++ b/gallery/gallery-configuration/src/main/config/properties/org/silverpeas/util/logging/galleryLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/gallery/gallery-configuration/src/main/config/xmlcomponents/gallery.xml b/gallery/gallery-configuration/src/main/config/xmlcomponents/gallery.xml index 302f88e8c6..aa3f40ea16 100644 --- a/gallery/gallery-configuration/src/main/config/xmlcomponents/gallery.xml +++ b/gallery/gallery-configuration/src/main/config/xmlcomponents/gallery.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <WAComponent xmlns="http://silverpeas.org/xml/ns/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://silverpeas.org/xml/ns/component http://www.silverpeas.org/xsd/component.xsd"> diff --git a/gallery/gallery-library/pom.xml b/gallery/gallery-library/pom.xml index 5fc7144c3b..a8135a0816 100644 --- a/gallery/gallery-library/pom.xml +++ b/gallery/gallery-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>gallery</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.gallery</groupId> diff --git a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/BaseGalleryIT.java b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/BaseGalleryIT.java index dfe66ca3e3..c921097c1a 100644 --- a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/BaseGalleryIT.java +++ b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/BaseGalleryIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery; diff --git a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/GalleryWarBuilder.java b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/GalleryWarBuilder.java index 25d9392510..a4a4327e2e 100644 --- a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/GalleryWarBuilder.java +++ b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/GalleryWarBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery; diff --git a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/dao/MediaDaoIT.java b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/dao/MediaDaoIT.java index 2c44c3703a..b47e0bd9e6 100644 --- a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/dao/MediaDaoIT.java +++ b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/dao/MediaDaoIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.dao; diff --git a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/image/MetadataExtractorIT.java b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/image/MetadataExtractorIT.java index 22d05500a8..45c7d92f0a 100644 --- a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/image/MetadataExtractorIT.java +++ b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/image/MetadataExtractorIT.java @@ -1,6 +1,6 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.image; diff --git a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/AbstractMediaIT.java b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/AbstractMediaIT.java index ed8e906033..a3c2b120a0 100644 --- a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/AbstractMediaIT.java +++ b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/AbstractMediaIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/InternalMediaIT.java b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/InternalMediaIT.java index 677671e002..c1dd5fe124 100644 --- a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/InternalMediaIT.java +++ b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/InternalMediaIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/PhotoIT.java b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/PhotoIT.java index 66648c8ea8..4f0b6d00b1 100644 --- a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/PhotoIT.java +++ b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/PhotoIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/SoundIT.java b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/SoundIT.java index 729922dbcf..677ef6d93b 100644 --- a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/SoundIT.java +++ b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/SoundIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/StreamingIT.java b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/StreamingIT.java index 55d424d469..c44c0cb113 100644 --- a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/StreamingIT.java +++ b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/StreamingIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/VideoIT.java b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/VideoIT.java index e7a9f538d3..3b4850103a 100644 --- a/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/VideoIT.java +++ b/gallery/gallery-library/src/integration-test/java/org/silverpeas/components/gallery/model/VideoIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/integration-test/resources/arquillian.xml b/gallery/gallery-library/src/integration-test/resources/arquillian.xml index fc68726bc5..ebca1fdd1e 100644 --- a/gallery/gallery-library/src/integration-test/resources/arquillian.xml +++ b/gallery/gallery-library/src/integration-test/resources/arquillian.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <arquillian xmlns="http://jboss.org/schema/arquillian" @@ -37,8 +37,8 @@ <container qualifier="wildfly-managed" default="true"> <configuration> <property name="serverConfig">standalone-full.xml</property> - <property name="startupTimeoutInSeconds">120</property> - <property name="allowConnectingToRunningServer">true</property> + <property name="startupTimeoutInSeconds">300</property> + <property name="allowConnectingToRunningServer">false</property> <property name="javaVmArguments">-Xms512M -Xmx2G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</property> <!-- uncomment it for debugging integration test --> <!-- @@ -46,4 +46,4 @@ --> </configuration> </container> -</arquillian> \ No newline at end of file +</arquillian> diff --git a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/galleryBundle.properties b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/galleryBundle.properties index ff778666bf..9da0750522 100644 --- a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/galleryBundle.properties +++ b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/galleryBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.addAlbum = Cr\u00e9er un album gallery.addSubAlbum = Cr\u00e9er un sous album diff --git a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle.properties b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle.properties index ed5fd19ab4..18287894a7 100644 --- a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle.properties +++ b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.model = Mod\u00E8le gallery.dataTime = Date de prise de vue diff --git a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle_en.properties b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle_en.properties index e9f95350c2..5eaedc43e4 100644 --- a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle_en.properties +++ b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.model = Model gallery.dataTime = Shot date diff --git a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle_fr.properties b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle_fr.properties index ed5fd19ab4..18287894a7 100644 --- a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle_fr.properties +++ b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/multilang/metadataBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # gallery.model = Mod\u00E8le gallery.dataTime = Date de prise de vue diff --git a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/gallerySettings.properties b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/gallerySettings.properties index fdd224ebde..e454ac7959 100644 --- a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/gallerySettings.properties +++ b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/gallerySettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # imagesSubDirectory = image diff --git a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/metadataSettings.properties b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/metadataSettings.properties index 8582455fa8..f64ebd7fd3 100644 --- a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/metadataSettings.properties +++ b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/metadataSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # imagesSubDirectory = image diff --git a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/metadataSettings_gallery52.properties b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/metadataSettings_gallery52.properties index 5e6b387075..4c1b67f746 100644 --- a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/metadataSettings_gallery52.properties +++ b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/gallery/settings/metadataSettings_gallery52.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # imagesSubDirectory = image display=METADATA_1,METADATA_2,METADATA_3,METADATA_4,METADATA_5,METADATA_6,METADATA_7,IPTC_8,IPTC_9,IPTC_10,IPTC_11,IPTC_12,IPTC_13,IPTC_14,IPTC_15,IPTC_16,IPTC_17,IPTC_18,IPTC_19,IPTC_20,IPTC_21,IPTC_22,IPTC_23,IPTC_24,IPTC_25,IPTC_26,IPTC_27,IPTC_28,IPTC_29,IPTC_30,IPTC_31 diff --git a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/general.properties b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/general.properties index 2c82257877..d2b4084083 100644 --- a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/general.properties +++ b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/general.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # ApplicationURL=/silverpeas/ diff --git a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/publication/publicationSettings.properties b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/publication/publicationSettings.properties index 2885a8586b..c39af6a3b6 100644 --- a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/publication/publicationSettings.properties +++ b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/publication/publicationSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # attachmentsSubDirectory = attachments imagesSubDirectory = images diff --git a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/util/attachment/mime_types.properties b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/util/attachment/mime_types.properties index 9df26eb674..30b61173cd 100644 --- a/gallery/gallery-library/src/integration-test/resources/org/silverpeas/util/attachment/mime_types.properties +++ b/gallery/gallery-library/src/integration-test/resources/org/silverpeas/util/attachment/mime_types.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # bz2 application/x-bzip tar.bz2 application/x-bzip diff --git a/gallery/gallery-library/src/integration-test/resources/test-ds.xml b/gallery/gallery-library/src/integration-test/resources/test-ds.xml index eaddc0bfad..55db3df229 100644 --- a/gallery/gallery-library/src/integration-test/resources/test-ds.xml +++ b/gallery/gallery-library/src/integration-test/resources/test-ds.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <datasources xmlns="http://www.jboss.org/ironjacamar/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryComponentSettings.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryComponentSettings.java index e9e548499a..616241769f 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryComponentSettings.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryComponentSettings.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryContentManager.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryContentManager.java index 2a1314fa1c..e26e949e17 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryContentManager.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryGlobalSilverpeasContentProcessor.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryGlobalSilverpeasContentProcessor.java index d90d9f07d1..20711d62aa 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryGlobalSilverpeasContentProcessor.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryGlobalSilverpeasContentProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryInstancePostConstruction.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryInstancePostConstruction.java index fe470cfb08..bfe579dce4 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryInstancePostConstruction.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryStatistics.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryStatistics.java index 1385f89ccf..36e21e9faa 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryStatistics.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/GalleryStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/MediaUtil.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/MediaUtil.java index 1fc1f5996f..27c5007c5f 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/MediaUtil.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/MediaUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,13 +19,12 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery; import org.apache.commons.fileupload.FileItem; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; import org.silverpeas.components.gallery.constant.MediaMimeType; import org.silverpeas.components.gallery.constant.MediaResolution; import org.silverpeas.components.gallery.constant.MediaType; @@ -67,6 +66,7 @@ import java.util.Set; import java.util.stream.Stream; +import static org.apache.commons.io.FilenameUtils.getExtension; import static org.apache.commons.io.filefilter.FileFilterUtils.*; import static org.silverpeas.components.gallery.constant.MediaResolution.*; import static org.silverpeas.core.io.media.image.ImageInfoType.HEIGHT_IN_PIXEL; @@ -572,7 +572,7 @@ private void createThumbnails() throws Exception { new MediaResolution[]{LARGE, PREVIEW, MEDIUM, SMALL, TINY}; final HandledFile originalFile = super.getHandledFile(); final HandledFile[] sources = Stream.of(thumbnailSrc).toArray(HandledFile[]::new); - final String originalFileExt = "." + FilenameUtils.getExtension(photo.getFileName()); + final String originalFileExt = "." + getExtension(photo.getFileName()); for (MediaResolution mediaResolution : mediaResolutions) { final boolean watermarkApplicable = mediaResolution.isWatermarkApplicable(); final int index = watermarkApplicable && thumbnailSrc[1] != null ? 1 : 0; @@ -654,10 +654,11 @@ private void computeWatermarks(Watermark watermark) { } private void createNormals(final Photo photo) { + final String originalFileExt = "." + getExtension(photo.getFileName()); // Normal duplication (for orientation) final HandledFile normalFile = super.getHandledFile() .getParentHandledFile() - .getHandledFile(photo.getId() + "_normal.jpg"); + .getHandledFile(photo.getId() + "_normal" + originalFileExt); getImageTool().convert(super.getHandledFile().getFile(), normalFile.getFile(), OrientationOption.auto()); thumbnailSrc[0] = normalFile; @@ -665,13 +666,13 @@ private void createNormals(final Photo photo) { if (!watermarkNormalOptions.isEmpty()) { final HandledFile watermarkFile = super.getHandledFile() .getParentHandledFile() - .getHandledFile(photo.getId() + "_watermark.jpg"); + .getHandledFile(photo.getId() + "_watermark" + originalFileExt); getImageTool().convert(super.getHandledFile().getFile(), watermarkFile.getFile(), watermarkNormalOptions); } if (!watermarkThumbnailOptions.isEmpty()) { final HandledFile watermarkFileForThumbnails = super.getHandledFile().getParentHandledFile() - .getHandledFile(photo.getId() + "_watermark_for_thumbnails.jpg"); + .getHandledFile(photo.getId() + "_watermark_for_thumbnails" + originalFileExt); getImageTool() .convert(super.getHandledFile().getFile(), watermarkFileForThumbnails.getFile(), watermarkThumbnailOptions); diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/GalleryResourceURIs.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/GalleryResourceURIs.java index fa0e7c42f7..e8f9817738 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/GalleryResourceURIs.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/GalleryResourceURIs.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.constant; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaMimeType.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaMimeType.java index ad56bb834d..d89a48e97d 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaMimeType.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaMimeType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.constant; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaResolution.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaResolution.java index f8d5a71867..09ae44d80d 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaResolution.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaResolution.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.constant; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaType.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaType.java index 1081eb8488..065b855788 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaType.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/MediaType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.constant; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/StreamingProvider.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/StreamingProvider.java index a4eb472240..3dd09f9cc1 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/StreamingProvider.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/constant/StreamingProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.constant; @@ -48,8 +48,8 @@ public enum StreamingProvider { unknown(null, null), youtube("(?i)(\\?|&)v=([a-z0-9]+)", "http://www.youtube.com/oembed?url={0}&format=json", "youtu"), vimeo("(?i)(/|=)([0-9]+)", "http://vimeo.com/api/oembed.json?url=http://vimeo.com/{0}"), - dailymotion("(?i)(/video/)([a-z0-9]+)", - "http://www.dailymotion.com/services/oembed?url=http://www.dailymotion.com/video/{0}"), + dailymotion("(?i)(/video/|dai.ly/)([a-z0-9]+)", + "http://www.dailymotion.com/services/oembed?url=http://www.dailymotion.com/video/{0}", "dai.ly"), soundcloud("(?i)(soundcloud.com/)(.+)", "http://soundcloud.com/oembed?url=http://soundcloud.com/{0}&format=json"); diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaDAO.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaDAO.java index e3537dd8bb..c543c57c9b 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaDAO.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.dao; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaOrderSQLQueryBuilder.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaOrderSQLQueryBuilder.java index 6de3c0ad81..eb1d5d023c 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaOrderSQLQueryBuilder.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaOrderSQLQueryBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.dao; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaSQLQueryBuilder.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaSQLQueryBuilder.java index 663aba627f..676c4c0279 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaSQLQueryBuilder.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/MediaSQLQueryBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.dao; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/OrderDAO.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/OrderDAO.java index 2f3de87d49..0301133622 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/OrderDAO.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/OrderDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.dao; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/PhotoDAO.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/PhotoDAO.java index a278110d76..69a8b358e4 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/PhotoDAO.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/dao/PhotoDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.dao; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/AbstractMediaDataDelegate.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/AbstractMediaDataDelegate.java index d49a5f0366..3246da520c 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/AbstractMediaDataDelegate.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/AbstractMediaDataDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.delegate; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/GalleryPasteDelegate.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/GalleryPasteDelegate.java index 700efe4897..ae5e7fd7fa 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/GalleryPasteDelegate.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/GalleryPasteDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.delegate; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/MediaDataCreateDelegate.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/MediaDataCreateDelegate.java index 7409982da8..0e85289a44 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/MediaDataCreateDelegate.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/MediaDataCreateDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.delegate; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/MediaDataUpdateDelegate.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/MediaDataUpdateDelegate.java index 155df0886a..f2de434985 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/MediaDataUpdateDelegate.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/delegate/MediaDataUpdateDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.delegate; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/AbstractMediaMetadataExtractor.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/AbstractMediaMetadataExtractor.java index 25829e75ac..c7e31fc4ed 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/AbstractMediaMetadataExtractor.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/AbstractMediaMetadataExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/DrewMediaMetadataExtractor.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/DrewMediaMetadataExtractor.java index d61f8ead3c..e97180eef3 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/DrewMediaMetadataExtractor.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/DrewMediaMetadataExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/ExifProperty.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/ExifProperty.java index a81a6e191d..68c78ce779 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/ExifProperty.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/ExifProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/IptcProperty.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/IptcProperty.java index ee77ed2b87..4a11a3de07 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/IptcProperty.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/IptcProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/MediaMetadataException.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/MediaMetadataException.java index 30e29b354c..42724c9db9 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/MediaMetadataException.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/MediaMetadataException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/MediaMetadataExtractor.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/MediaMetadataExtractor.java index ac7166f771..a82d009ccd 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/MediaMetadataExtractor.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/media/MediaMetadataExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/AlbumDetail.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/AlbumDetail.java index 5ebce068d3..24853a839a 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/AlbumDetail.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/AlbumDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/AlbumMedia.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/AlbumMedia.java index d7b4716688..4d1b041204 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/AlbumMedia.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/AlbumMedia.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/GalleryRuntimeException.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/GalleryRuntimeException.java index 2c20936abf..cc63e95d05 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/GalleryRuntimeException.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/GalleryRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/InternalMedia.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/InternalMedia.java index 7c393ecbd8..80d0472eca 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/InternalMedia.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/InternalMedia.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; @@ -195,11 +195,14 @@ public SilverpeasFile getFile(final MediaResolution mediaResolution, final Strin potentialFileNames.add(getFileName()); if (getType().isPhoto()) { final String thumbnailSuffix = mediaResolution.getThumbnailSuffix(); + final String originalFileExt = "." + FilenameUtils.getExtension(getFileName()); if (mediaResolution == MediaResolution.NORMAL) { - potentialFileNames.add(getId() + thumbnailSuffix + ".jpg"); + potentialFileNames.add(getId() + thumbnailSuffix + originalFileExt); } else if (StringUtil.isDefined(thumbnailSuffix)) { - final String originalFileExt = "." + FilenameUtils.getExtension(getFileName()); potentialFileNames.set(0, getId() + thumbnailSuffix + originalFileExt); + } + if (!".jpg".equalsIgnoreCase(originalFileExt)) { + // this case is about taking in charge the old medias potentialFileNames.add(getId() + thumbnailSuffix + ".jpg"); } } @@ -262,4 +265,4 @@ public Collection<String> getMetaDataProperties() { } return properties; } -} \ No newline at end of file +} diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Media.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Media.java index 9595182421..596ce41918 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Media.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Media.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaCriteria.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaCriteria.java index acca1b0316..efae1399a2 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaCriteria.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaCriteria.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaCriteriaProcessor.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaCriteriaProcessor.java index b365be88d2..5bbd074332 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaCriteriaProcessor.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaCriteriaProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaLogicalComparator.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaLogicalComparator.java index baebd172de..9bc29ec106 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaLogicalComparator.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaLogicalComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaOrderCriteria.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaOrderCriteria.java index cf20590a99..5e04d3dfe8 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaOrderCriteria.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaOrderCriteria.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaOrderCriteriaProcessor.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaOrderCriteriaProcessor.java index 10dd320afd..3ffa38ec84 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaOrderCriteriaProcessor.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaOrderCriteriaProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaPK.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaPK.java index a83c2b3747..ec75144b8e 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaPK.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaPK.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaSelection.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaSelection.java index 9c562e1d40..083d7f6f95 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaSelection.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaSelection.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaWithStatus.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaWithStatus.java index 76428d703a..2ddc121ac9 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaWithStatus.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MediaWithStatus.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MetaData.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MetaData.java index 3b78f0a96b..6f73ae23a1 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MetaData.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/MetaData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Order.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Order.java index c80941a2fe..1ebea5df23 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Order.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Order.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/OrderRow.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/OrderRow.java index 117458d96a..d3dc2e3f5d 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/OrderRow.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/OrderRow.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/OrderRowStatus.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/OrderRowStatus.java index 9c8e5d437c..dc440f56dc 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/OrderRowStatus.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/OrderRowStatus.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Photo.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Photo.java index b58e67d09b..25695a033d 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Photo.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Photo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Sound.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Sound.java index a8fbe77f89..a86792d04c 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Sound.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Sound.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Streaming.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Streaming.java index f502ce8039..fdeb004c82 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Streaming.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Streaming.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; @@ -130,7 +130,7 @@ public String getApplicationEmbedUrl(final MediaResolution mediaResolution) { * @return a JSON structure as string that represents oembed data. */ public static String getJsonOembedAsString(String homepageUrl) { - return StreamingProvider.getOembedUrl(homepageUrl).map(oembedUrl -> { + return StreamingProvider.getOembedUrl(homepageUrl).map(u -> u.replace("http:", "https:")).map(oembedUrl -> { try { final HttpResponse<String> response = httpClient().send(toUrl(oembedUrl) .header("Accept", APPLICATION_JSON) @@ -178,4 +178,4 @@ public boolean equals(final Object o) { public int hashCode() { return Objects.hash(super.hashCode(), homepageUrl, provider); } -} \ No newline at end of file +} diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Video.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Video.java index a14474c947..aaa1bec457 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Video.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/model/Video.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEvent.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEvent.java index adfb9bd967..8ffbfa8ade 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEvent.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEventListener.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEventListener.java index f6e496ab75..920a719f83 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEventListener.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEventNotifier.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEventNotifier.java index 12464d0027..ca6cb12937 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEventNotifier.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/AlbumMediaEventNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AbstractGalleryAlbumUserNotification.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AbstractGalleryAlbumUserNotification.java index 28d4318c4a..bd8fd1e833 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AbstractGalleryAlbumUserNotification.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AbstractGalleryAlbumUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification.user; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AbstractGalleryUserNotification.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AbstractGalleryUserNotification.java index 53c74f8719..ad9a651830 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AbstractGalleryUserNotification.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AbstractGalleryUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification.user; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AlbumMediaNotificationManager.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AlbumMediaNotificationManager.java index 59035ee57b..233096af1c 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AlbumMediaNotificationManager.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/AlbumMediaNotificationManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification.user; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/GalleryAlbumMediaSubscriptionNotificationBuilder.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/GalleryAlbumMediaSubscriptionNotificationBuilder.java index 1b2bab49ea..61963e6406 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/GalleryAlbumMediaSubscriptionNotificationBuilder.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/GalleryAlbumMediaSubscriptionNotificationBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification.user; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/GalleryUserAlertNotification.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/GalleryUserAlertNotification.java index 8a1ddb27f9..01e00b38f9 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/GalleryUserAlertNotification.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/notification/user/GalleryUserAlertNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification.user; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/AbstractGalleryDataProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/AbstractGalleryDataProcess.java index 77d320c836..a7eeb12058 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/AbstractGalleryDataProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/AbstractGalleryDataProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/AbstractGalleryFileProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/AbstractGalleryFileProcess.java index 3b89ecb079..862c347e92 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/AbstractGalleryFileProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/AbstractGalleryFileProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/GalleryProcessManagement.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/GalleryProcessManagement.java index 3ed4b77558..53c9ed8de6 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/GalleryProcessManagement.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/GalleryProcessManagement.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryCreateMediaDataProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryCreateMediaDataProcess.java index de643d13fe..9731cf348f 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryCreateMediaDataProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryCreateMediaDataProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryCreateMediaFileProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryCreateMediaFileProcess.java index c4436221a4..875c822eb5 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryCreateMediaFileProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryCreateMediaFileProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeindexMediaDataProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeindexMediaDataProcess.java index 200cca3565..bc2fe51c84 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeindexMediaDataProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeindexMediaDataProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeleteMediaDataProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeleteMediaDataProcess.java index ffd7d65b09..6432bad2af 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeleteMediaDataProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeleteMediaDataProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeleteMediaFileProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeleteMediaFileProcess.java index d910d57875..8ec67d4374 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeleteMediaFileProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeleteMediaFileProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryIndexMediaDataProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryIndexMediaDataProcess.java index daf565ba18..74816eb7e0 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryIndexMediaDataProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryIndexMediaDataProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryLoadMetaDataProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryLoadMetaDataProcess.java index fcc80efb7d..b6d4c10d36 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryLoadMetaDataProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryLoadMetaDataProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryPasteMediaDataProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryPasteMediaDataProcess.java index 53ec0abe68..74e382d737 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryPasteMediaDataProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryPasteMediaDataProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryPasteMediaFileProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryPasteMediaFileProcess.java index eceb326b30..1b58d5cae5 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryPasteMediaFileProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryPasteMediaFileProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryUpdateMediaDataProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryUpdateMediaDataProcess.java index 4f3e1c1143..cadc4fedeb 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryUpdateMediaDataProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryUpdateMediaDataProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryUpdateMediaFileProcess.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryUpdateMediaFileProcess.java index a94b7c87db..87126d98aa 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryUpdateMediaFileProcess.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryUpdateMediaFileProcess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.process.media; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/DefaultGalleryService.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/DefaultGalleryService.java index 57dfec0aff..0f0c47fb13 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/DefaultGalleryService.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/DefaultGalleryService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.service; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/GalleryInitialize.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/GalleryInitialize.java index c48aaa52e7..2865c43428 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/GalleryInitialize.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/GalleryInitialize.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.service; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/GalleryService.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/GalleryService.java index db3fe8acca..a865f2935f 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/GalleryService.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/GalleryService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.service; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/MediaServiceProvider.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/MediaServiceProvider.java index c1baf9252f..609b688951 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/MediaServiceProvider.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/MediaServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.service; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/ScheduledAlertUser.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/ScheduledAlertUser.java index dd4f8f6ae8..da26a18979 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/ScheduledAlertUser.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/ScheduledAlertUser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.service; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/ScheduledDeleteOrder.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/ScheduledDeleteOrder.java index 8d35f06fb0..a0a96a8128 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/ScheduledDeleteOrder.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/service/ScheduledDeleteOrder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.service; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialGalleryMedia.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialGalleryMedia.java index 3732080c82..26497e729b 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialGalleryMedia.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialGalleryMedia.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.socialnetwork; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialGalleryMediaComment.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialGalleryMediaComment.java index 9f0719a0ea..829b62cd52 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialGalleryMediaComment.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialGalleryMediaComment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.socialnetwork; diff --git a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialInformationGallery.java b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialInformationGallery.java index 838c461e53..71d53ac5c7 100644 --- a/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialInformationGallery.java +++ b/gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/socialnetwork/SocialInformationGallery.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.socialnetwork; diff --git a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaDefinitionTest.java b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaDefinitionTest.java index 0ec582c266..3229589546 100644 --- a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaDefinitionTest.java +++ b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaDefinitionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.constant; diff --git a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaMimeTypeTest.java b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaMimeTypeTest.java index 3c44a31a0d..916c9932bb 100644 --- a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaMimeTypeTest.java +++ b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaMimeTypeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.constant; diff --git a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaResolutionTest.java b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaResolutionTest.java index 2be4b30416..19d9c83656 100644 --- a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaResolutionTest.java +++ b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaResolutionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.constant; diff --git a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaTypeTest.java b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaTypeTest.java index 3efb41e12d..3ddcc939dd 100644 --- a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaTypeTest.java +++ b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/MediaTypeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.constant; diff --git a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/StreamingProviderTest.java b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/StreamingProviderTest.java index ac88a65399..27c0ffbd31 100644 --- a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/StreamingProviderTest.java +++ b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/constant/StreamingProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General License for more details. * * You should have received a copy of the GNU Affero General License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.constant; diff --git a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/model/MediaTest.java b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/model/MediaTest.java index 2e85037539..8ab8e26ac9 100644 --- a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/model/MediaTest.java +++ b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/model/MediaTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.model; diff --git a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/notification/user/AlbumMediaNotificationManagerTest.java b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/notification/user/AlbumMediaNotificationManagerTest.java index d37ca5cde2..40a7a09d2d 100644 --- a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/notification/user/AlbumMediaNotificationManagerTest.java +++ b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/notification/user/AlbumMediaNotificationManagerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification.user; diff --git a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/notification/user/GalleryAlbumMediaSubscriptionNotificationBuilderTest.java b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/notification/user/GalleryAlbumMediaSubscriptionNotificationBuilderTest.java index 9758681881..b4361979fe 100644 --- a/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/notification/user/GalleryAlbumMediaSubscriptionNotificationBuilderTest.java +++ b/gallery/gallery-library/src/test/java/org/silverpeas/components/gallery/notification/user/GalleryAlbumMediaSubscriptionNotificationBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification.user; diff --git a/gallery/gallery-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer b/gallery/gallery-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer index 9785bab5e6..02b5b225ce 100644 --- a/gallery/gallery-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer +++ b/gallery/gallery-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # org.silverpeas.core.test.TestBeanContainer \ No newline at end of file diff --git a/gallery/gallery-library/src/test/resources/maven.properties b/gallery/gallery-library/src/test/resources/maven.properties index aa462447a2..e144ff8c81 100644 --- a/gallery/gallery-library/src/test/resources/maven.properties +++ b/gallery/gallery-library/src/test/resources/maven.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # To change this template, choose Tools | Templates # and open the template in the editor. diff --git a/gallery/gallery-library/src/test/resources/org/silverpeas/gallery/settings/gallerySettings.properties b/gallery/gallery-library/src/test/resources/org/silverpeas/gallery/settings/gallerySettings.properties index fdd224ebde..e454ac7959 100644 --- a/gallery/gallery-library/src/test/resources/org/silverpeas/gallery/settings/gallerySettings.properties +++ b/gallery/gallery-library/src/test/resources/org/silverpeas/gallery/settings/gallerySettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # imagesSubDirectory = image diff --git a/gallery/gallery-library/src/test/resources/org/silverpeas/general.properties b/gallery/gallery-library/src/test/resources/org/silverpeas/general.properties index 2c82257877..d2b4084083 100644 --- a/gallery/gallery-library/src/test/resources/org/silverpeas/general.properties +++ b/gallery/gallery-library/src/test/resources/org/silverpeas/general.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # ApplicationURL=/silverpeas/ diff --git a/gallery/gallery-war/pom.xml b/gallery/gallery-war/pom.xml index aa2f6fb91c..839eaccb85 100644 --- a/gallery/gallery-war/pom.xml +++ b/gallery/gallery-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>gallery</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.gallery</groupId> diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/GalleryIndexer.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/GalleryIndexer.java index e06a4fd13c..63df4fafac 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/GalleryIndexer.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/GalleryIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/ParameterNames.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/ParameterNames.java index 08706db5f6..19f9d87957 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/ParameterNames.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/ParameterNames.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/control/GalleryExporter.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/control/GalleryExporter.java index 69102bf327..eda25fc3a3 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/control/GalleryExporter.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/control/GalleryExporter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.control; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/control/GallerySessionController.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/control/GallerySessionController.java index c6c396cdab..07bcf573f5 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/control/GallerySessionController.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/control/GallerySessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.control; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/notification/GalleryInstanceManualUserNotification.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/notification/GalleryInstanceManualUserNotification.java index 28dda0c891..0c8bccc384 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/notification/GalleryInstanceManualUserNotification.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/notification/GalleryInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.notification; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/AjaxServlet.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/AjaxServlet.java index 96d68ab158..f89946c5b9 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/AjaxServlet.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/AjaxServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.servlets; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryDragAndDrop.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryDragAndDrop.java index c8cc5dfb17..07e60fc546 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryDragAndDrop.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryDragAndDrop.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.servlets; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryInWysiwygRouter.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryInWysiwygRouter.java index 308246047c..3dc25f1e8b 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryInWysiwygRouter.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryInWysiwygRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.servlets; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryRequestRouter.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryRequestRouter.java index 4abac9aa29..197c7c8ba5 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryRequestRouter.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GalleryRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.servlets; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GoToImage.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GoToImage.java index cb40fc4a2e..f49c1cb53a 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GoToImage.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/servlets/GoToImage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.servlets; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AbstractGalleryResource.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AbstractGalleryResource.java index 3c79665fe8..34e8ec36b0 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AbstractGalleryResource.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AbstractGalleryResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AbstractMediaEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AbstractMediaEntity.java index 14111f6fd1..7f2114e465 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AbstractMediaEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AbstractMediaEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AlbumEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AlbumEntity.java index efb0531dbe..8a25c9eb78 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AlbumEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/AlbumEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/DailymotionDataEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/DailymotionDataEntity.java index 24a529d952..7f95568a63 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/DailymotionDataEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/DailymotionDataEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/ExportOptionValue.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/ExportOptionValue.java index 01dfa68e7a..340407a3eb 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/ExportOptionValue.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/ExportOptionValue.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/GalleryInstanceFileUploadVerification.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/GalleryInstanceFileUploadVerification.java index ee1e7b146f..44a65fe8df 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/GalleryInstanceFileUploadVerification.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/GalleryInstanceFileUploadVerification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/GalleryResource.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/GalleryResource.java index 7c3c71ae22..d6f16263db 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/GalleryResource.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/GalleryResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/MediaSort.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/MediaSort.java index 0e88651eed..35fa4652c7 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/MediaSort.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/MediaSort.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/OembedDataEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/OembedDataEntity.java index efd15343dd..70597b69a8 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/OembedDataEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/OembedDataEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/PhotoEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/PhotoEntity.java index ba21805a85..56caa630e8 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/PhotoEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/PhotoEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/SoundEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/SoundEntity.java index bfd277167e..56becccc1c 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/SoundEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/SoundEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/SoundcloudDataEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/SoundcloudDataEntity.java index 664f44b4a7..8b861602ce 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/SoundcloudDataEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/SoundcloudDataEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/StreamingEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/StreamingEntity.java index ddbe1b7253..9c037091bc 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/StreamingEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/StreamingEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/StreamingProviderDataEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/StreamingProviderDataEntity.java index 0b4b448623..be70acfe13 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/StreamingProviderDataEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/StreamingProviderDataEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/VideoEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/VideoEntity.java index c2575bcc18..fd0e5b9139 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/VideoEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/VideoEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/VimeoDataEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/VimeoDataEntity.java index 0e81187ca6..401a06639a 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/VimeoDataEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/VimeoDataEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/YoutubeDataEntity.java b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/YoutubeDataEntity.java index 79bad31088..8aa0cc5b0c 100644 --- a/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/YoutubeDataEntity.java +++ b/gallery/gallery-war/src/main/java/org/silverpeas/components/gallery/web/YoutubeDataEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.web; diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/albumListDisplaySelector.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/albumListDisplaySelector.tag index ac0e69d682..01681b7f9f 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/albumListDisplaySelector.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/albumListDisplaySelector.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/albumListHeader.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/albumListHeader.tag index a751b1ce9e..2ec8a11e1f 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/albumListHeader.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/albumListHeader.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/browseBar.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/browseBar.tag index dce0dae917..bca8cf2459 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/browseBar.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/browseBar.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/diaporama.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/diaporama.tag index 4641fe1aed..b65075c4f9 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/diaporama.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/diaporama.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayAlbumContent.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayAlbumContent.tag index 43e331c5a4..b2f216278a 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayAlbumContent.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayAlbumContent.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayMediaInAlbumContent.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayMediaInAlbumContent.tag index 7c53841f6f..bc398daaf7 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayMediaInAlbumContent.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayMediaInAlbumContent.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayMediaMetadata.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayMediaMetadata.tag index 6ced8efae3..e05443a94d 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayMediaMetadata.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/displayMediaMetadata.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/editMedia.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/editMedia.tag index f7e542d508..05101b4c4c 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/editMedia.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/editMedia.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/editMediaLayout.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/editMediaLayout.tag index 2a977486f1..f4f5bd1c0f 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/editMediaLayout.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/editMediaLayout.tag @@ -2,7 +2,7 @@ <%@ tag import="org.silverpeas.core.contribution.content.form.Form" %> <%@ tag import="org.silverpeas.core.contribution.content.form.PagesContext" %> <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -14,7 +14,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +22,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/handleMediaPreview.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/handleMediaPreview.tag index a26d99fe08..109f0810db 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/handleMediaPreview.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/handleMediaPreview.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/listSubAlbums.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/listSubAlbums.tag index ab4aa3bd96..56558352c2 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/listSubAlbums.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/listSubAlbums.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/soundPlayer.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/soundPlayer.tag index 67c5f40f60..d9add2dd78 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/soundPlayer.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/soundPlayer.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/streamingLibrary.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/streamingLibrary.tag index f8edc79e68..3241b85a49 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/streamingLibrary.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/streamingLibrary.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/streamingPlayer.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/streamingPlayer.tag index d846137e5b..fe6fd87112 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/streamingPlayer.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/streamingPlayer.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/videoPlayer.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/videoPlayer.tag index 41eaf06f6b..543c82d261 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/videoPlayer.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/videoPlayer.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/viewMediaLayout.tag b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/viewMediaLayout.tag index 83806b2dd8..3406af9199 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/viewMediaLayout.tag +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/tags/silverpeas/gallery/viewMediaLayout.tag @@ -3,7 +3,7 @@ <%@ tag import="org.silverpeas.core.contribution.content.form.PagesContext" %> <%@ tag import="org.silverpeas.core.notification.user.NotificationContext" %> <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -15,7 +15,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,7 +23,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/gallery/gallery-war/src/main/webapp/WEB-INF/web.xml b/gallery/gallery-war/src/main/webapp/WEB-INF/web.xml index a28643f93d..d727b8274f 100644 --- a/gallery/gallery-war/src/main/webapp/WEB-INF/web.xml +++ b/gallery/gallery-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/albumManager.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/albumManager.jsp index 6ad4e1235c..f32dcc4845 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/albumManager.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/albumManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/albumsOfMedia.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/albumsOfMedia.jsp index 2caddb2a0e..215a01bef1 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/albumsOfMedia.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/albumsOfMedia.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/askMedia.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/askMedia.jsp index e5b15230bc..7f445a8eb8 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/askMedia.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/askMedia.jsp @@ -1,7 +1,7 @@ <%@ page import="org.silverpeas.core.web.util.viewgenerator.html.buttonpanes.ButtonPane" %> <%@ page import="org.silverpeas.core.web.util.viewgenerator.html.buttons.Button" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/basket.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/basket.jsp index 9891dac983..c09a7cfa62 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/basket.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/basket.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/basketForm.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/basketForm.jsp index 556aa63b7b..deb8c9308f 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/basketForm.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/basketForm.jsp @@ -5,7 +5,7 @@ <%@ page import="org.silverpeas.core.contribution.content.form.DataRecord" %> <%@ page import="org.silverpeas.core.contribution.content.form.Form" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -17,7 +17,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -25,7 +25,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/check.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/check.jsp index 0833110104..8b6a89f309 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/check.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/closeWindow.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/closeWindow.jsp index a073de2374..1789a15282 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/closeWindow.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/closeWindow.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/downloadZip.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/downloadZip.jsp index 0349b5a2a4..e55001cae6 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/downloadZip.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/downloadZip.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/javaScript/silverpeas-gallery-slider.js b/gallery/gallery-war/src/main/webapp/gallery/jsp/javaScript/silverpeas-gallery-slider.js index 19ba1735f6..7017a5eb92 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/javaScript/silverpeas-gallery-slider.js +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/javaScript/silverpeas-gallery-slider.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ (function($, initialValue) { var context = { diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaPhotoEdit.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaPhotoEdit.jsp index fe74b3d69b..d9c909df09 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaPhotoEdit.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaPhotoEdit.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaPhotoView.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaPhotoView.jsp index e9b1acefcd..ece697cf6f 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaPhotoView.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaPhotoView.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaSoundEdit.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaSoundEdit.jsp index 73f041b5e3..d1d118abb6 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaSoundEdit.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaSoundEdit.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaSoundView.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaSoundView.jsp index f108850295..252f14de69 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaSoundView.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaSoundView.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaStreamingEdit.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaStreamingEdit.jsp index 5b1a1d5437..d6807f0aa3 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaStreamingEdit.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaStreamingEdit.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaStreamingView.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaStreamingView.jsp index 373606eb94..b1e924c937 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaStreamingView.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaStreamingView.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaVideoEdit.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaVideoEdit.jsp index 44fc24b42b..ac6bfed560 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaVideoEdit.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaVideoEdit.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaVideoView.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaVideoView.jsp index dab96ca86f..7c2ecc9665 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaVideoView.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/mediaVideoView.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/order.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/order.jsp index 8d27af7972..ad81c5ab78 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/order.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/order.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/orders.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/orders.jsp index 409cbd9c27..eb9192e6f0 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/orders.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/orders.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/pathsManager.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/pathsManager.jsp index 229a98b852..6a32371dce 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/pathsManager.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/pathsManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/portlet.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/portlet.jsp index 8f123fd4c2..daaac0a3b6 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/portlet.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/result.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/result.jsp index f9c267dba2..e57b1b18f5 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/result.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/result.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/searchAdvanced.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/searchAdvanced.jsp index 4fbc837077..cad8571284 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/searchAdvanced.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/searchAdvanced.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> @@ -62,11 +62,15 @@ <script type="text/javascript"> function sendData() { if (checkLuceneQuery()) { - var values = $('#used_pdc').pdc('selectedValues'); + <c:if test="${isPdcActivated}"> + const values = $('#used_pdc').pdc('selectedValues'); if (values.length > 0) { document.searchForm.AxisValueCouples.value = values.flatten(); } - setTimeout("document.searchForm.submit();", 500); + </c:if> + setTimeout(function() { + document.searchForm.submit(); + }, 500); } } diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/selectedMediaManager.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/selectedMediaManager.jsp index de3d6266e6..97fffe2af5 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/selectedMediaManager.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/selectedMediaManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/selectedPdcPositions.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/selectedPdcPositions.jsp index c871c22c34..3b2fc4eef4 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/selectedPdcPositions.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/selectedPdcPositions.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/styleSheets/gallery.css b/gallery/gallery-war/src/main/webapp/gallery/jsp/styleSheets/gallery.css index 6f84c321a0..f1143929ee 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/styleSheets/gallery.css +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/styleSheets/gallery.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ #subTopics { width: 100%; diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/viewAlbum.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/viewAlbum.jsp index 6638fa3c3c..a29daacb30 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/viewAlbum.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/viewAlbum.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/viewRestrictedMediaList.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/viewRestrictedMediaList.jsp index 82ca439e14..42dad3fb64 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/viewRestrictedMediaList.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/viewRestrictedMediaList.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> <%@ include file="check.jsp" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/welcome.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/welcome.jsp index 427ceb85aa..53ca662d48 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/welcome.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/welcome.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygAlbums.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygAlbums.jsp index 1a1ec9a8cb..9645cbca40 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygAlbums.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygAlbums.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.node.model.NodeDetail"%> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygBrowser.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygBrowser.jsp index eec594836a..b642439df5 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygBrowser.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygBrowser.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,12 +20,14 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page import="org.silverpeas.core.util.ResourceLocator" %> <%@ page import="org.owasp.encoder.Encode" %> +<%@ page import="org.silverpeas.core.util.StringUtil" %> + <% response.setDateHeader("Expires", -1); response.setHeader( "Pragma", "no-cache" ); @@ -44,14 +46,13 @@ String m_context = ResourceLocator.getGeneralSettingBundle().getString("Applicat <head> <title></title> <script type="text/javascript"> -function selectImage(url) -{ -<%if(fieldName != null){%> - window.opener.choixImageInGallery<%=fieldName%>(url); -<%}else{%> - window.opener.choixImageInGallery(url); -<%}%> - window.close(); +function selectImage(url) { + <%if(StringUtil.isDefined(fieldName)){%> + window.opener.choixImageInGallery<%=fieldName%>(url); + <%}else{%> + window.opener.choixImageInGallery(url); + <%}%> + window.close(); } </script> </head> diff --git a/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygImages.jsp b/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygImages.jsp index 9c444f69c6..a4ced4c71a 100644 --- a/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygImages.jsp +++ b/gallery/gallery-war/src/main/webapp/gallery/jsp/wysiwygImages.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/gallery/gallery-war/src/test/java/org/silverpeas/components/gallery/servlets/ImageUrlAccordingToHtmlSizeDirectiveTranslatorTest.java b/gallery/gallery-war/src/test/java/org/silverpeas/components/gallery/servlets/ImageUrlAccordingToHtmlSizeDirectiveTranslatorTest.java index e8de33a2b4..634ac39773 100644 --- a/gallery/gallery-war/src/test/java/org/silverpeas/components/gallery/servlets/ImageUrlAccordingToHtmlSizeDirectiveTranslatorTest.java +++ b/gallery/gallery-war/src/test/java/org/silverpeas/components/gallery/servlets/ImageUrlAccordingToHtmlSizeDirectiveTranslatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.gallery.servlets; diff --git a/gallery/gallery-war/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer b/gallery/gallery-war/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer index 9785bab5e6..02b5b225ce 100644 --- a/gallery/gallery-war/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer +++ b/gallery/gallery-war/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # org.silverpeas.core.test.TestBeanContainer \ No newline at end of file diff --git a/gallery/pom.xml b/gallery/pom.xml index 39a16fb011..aa30401a31 100644 --- a/gallery/pom.xml +++ b/gallery/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/hyperlink/hyperlink-configuration/pom.xml b/hyperlink/hyperlink-configuration/pom.xml index 5cec432817..9f8b99b58e 100644 --- a/hyperlink/hyperlink-configuration/pom.xml +++ b/hyperlink/hyperlink-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>hyperlink</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.hyperlink</groupId> diff --git a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle.properties b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle.properties index 15945549c8..ecb865f8f9 100644 --- a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle.properties +++ b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # hyperlink.explications = Si aucune nouvelle fen\u00eatre n'est apparue, v\u00e9rifiez le blocage des pop-up et cliquez hyperlink.ici = ici \ No newline at end of file diff --git a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_de.properties b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_de.properties index 42cdc79d30..afbb2c0126 100644 --- a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_de.properties +++ b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # hyperlink.explications = If no new window appears, check the pop-up blocking and click diff --git a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_en.properties b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_en.properties index 81fae3afb3..68c6937c51 100644 --- a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_en.properties +++ b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # hyperlink.explications = If no new window appears, check the pop-up blocking and click hyperlink.ici = here \ No newline at end of file diff --git a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_fr.properties b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_fr.properties index 1023b206cf..fe11b3b0cd 100644 --- a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_fr.properties +++ b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/multilang/hyperlinkBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # hyperlink.explications = Si aucune nouvelle fen\u00eatre n'est apparue, v\u00e9rifiez le blocage des pop-up et cliquez hyperlink.ici = ici diff --git a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/settings/hyperlinkSettings.properties b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/settings/hyperlinkSettings.properties index ad2170b1d9..fc10b9b1c5 100644 --- a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/settings/hyperlinkSettings.properties +++ b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/hyperlink/settings/hyperlinkSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # #Specify if the key ST_PASSWORD must be processed or not #possible values = true, false diff --git a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/util/logging/hyperlinkLogging.properties b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/util/logging/hyperlinkLogging.properties index cd1a9edfde..378c3ca08a 100644 --- a/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/util/logging/hyperlinkLogging.properties +++ b/hyperlink/hyperlink-configuration/src/main/config/properties/org/silverpeas/util/logging/hyperlinkLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hyperlink/hyperlink-configuration/src/main/config/xmlcomponents/hyperlink.xml b/hyperlink/hyperlink-configuration/src/main/config/xmlcomponents/hyperlink.xml index 6c5b285253..48f7f0afa8 100644 --- a/hyperlink/hyperlink-configuration/src/main/config/xmlcomponents/hyperlink.xml +++ b/hyperlink/hyperlink-configuration/src/main/config/xmlcomponents/hyperlink.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/hyperlink/hyperlink-library/pom.xml b/hyperlink/hyperlink-library/pom.xml index 19fc8354a8..3f23315021 100644 --- a/hyperlink/hyperlink-library/pom.xml +++ b/hyperlink/hyperlink-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>hyperlink</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.hyperlink</groupId> diff --git a/hyperlink/hyperlink-library/src/main/java/org/silverpeas/components/hyperlink/HyperlinkException.java b/hyperlink/hyperlink-library/src/main/java/org/silverpeas/components/hyperlink/HyperlinkException.java index a67f2c6bb2..4d62d41f28 100644 --- a/hyperlink/hyperlink-library/src/main/java/org/silverpeas/components/hyperlink/HyperlinkException.java +++ b/hyperlink/hyperlink-library/src/main/java/org/silverpeas/components/hyperlink/HyperlinkException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.hyperlink; diff --git a/hyperlink/hyperlink-library/src/main/java/org/silverpeas/components/hyperlink/HyperlinkStatistics.java b/hyperlink/hyperlink-library/src/main/java/org/silverpeas/components/hyperlink/HyperlinkStatistics.java index ff27e22bef..c442705677 100644 --- a/hyperlink/hyperlink-library/src/main/java/org/silverpeas/components/hyperlink/HyperlinkStatistics.java +++ b/hyperlink/hyperlink-library/src/main/java/org/silverpeas/components/hyperlink/HyperlinkStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.hyperlink; diff --git a/hyperlink/hyperlink-war/pom.xml b/hyperlink/hyperlink-war/pom.xml index 7ac9ae81ac..85c73d1c99 100644 --- a/hyperlink/hyperlink-war/pom.xml +++ b/hyperlink/hyperlink-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>hyperlink</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.hyperlink</groupId> diff --git a/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/HyperlinkIndexer.java b/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/HyperlinkIndexer.java index a723bf0970..94f06ac72d 100644 --- a/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/HyperlinkIndexer.java +++ b/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/HyperlinkIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.hyperlink; diff --git a/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/control/HyperlinkSessionController.java b/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/control/HyperlinkSessionController.java index f351fa6b85..666d97d5f1 100644 --- a/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/control/HyperlinkSessionController.java +++ b/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/control/HyperlinkSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.hyperlink.control; diff --git a/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/servlets/HyperlinkRequestRouter.java b/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/servlets/HyperlinkRequestRouter.java index 2fceb62fd0..76e2a52a16 100644 --- a/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/servlets/HyperlinkRequestRouter.java +++ b/hyperlink/hyperlink-war/src/main/java/org/silverpeas/components/hyperlink/servlets/HyperlinkRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.hyperlink.servlets; @@ -129,7 +129,7 @@ private String getHyperlinkTarget(final HttpRequest request, request.setAttribute("Method", methodType); destination = AUTHENTICATION_DEST; } else { - final String finalAimedUrl = formatAimedUrl(hyperlinkSCC, request, aimedUrl); + final String finalAimedUrl = formatAimedUrl(hyperlinkSCC, request, aimedUrl, isInternalLink); request.setAttribute("IsInternalLink", isInternalLink); if(request.getParameterAsBoolean("fromRedirect")) { destination = finalAimedUrl; @@ -145,7 +145,7 @@ private String getHyperlinkTarget(final HttpRequest request, } private String formatAimedUrl(final HyperlinkSessionController hyperlinkSCC, - final HttpRequest request, final String originalAimedUrl) { + final HttpRequest request, final String originalAimedUrl, boolean internalLink) { final User user = hyperlinkSCC.getUserDetail(); String aimedUrl = originalAimedUrl; aimedUrl = getParsedDestination(aimedUrl, USER_LOGIN, encode(user.getLogin())); @@ -166,10 +166,11 @@ private String formatAimedUrl(final HyperlinkSessionController hyperlinkSCC, aimedUrl = getParsedDestination(aimedUrl, USER_PASSWORD, encode("??????")); } aimedUrl = getParsedDestinationWithExtraInfos(aimedUrl, hyperlinkSCC); - return UriBuilder.fromUri(aimedUrl) - .queryParam("Referer", hyperlinkSCC.getComponentId()) - .build() - .toString(); + UriBuilder uriBuilder = UriBuilder.fromUri(aimedUrl); + if (internalLink) { + uriBuilder.queryParam("Referer", hyperlinkSCC.getComponentId()); + } + return uriBuilder.build().toString(); } /** diff --git a/hyperlink/hyperlink-war/src/main/webapp/WEB-INF/web.xml b/hyperlink/hyperlink-war/src/main/webapp/WEB-INF/web.xml index acc352bc6c..bfa4a597f9 100644 --- a/hyperlink/hyperlink-war/src/main/webapp/WEB-INF/web.xml +++ b/hyperlink/hyperlink-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/check.jsp b/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/check.jsp index be8a0dc9e8..10c6e2ead2 100644 --- a/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/check.jsp +++ b/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/internal.jsp b/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/internal.jsp index 4bebdd61cf..ffb05ee2ef 100644 --- a/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/internal.jsp +++ b/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/internal.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib tagdir="/WEB-INF/tags/silverpeas/util" prefix="viewTags" %> diff --git a/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/redirect.jsp b/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/redirect.jsp index 7232725eb2..d1d129b8fd 100644 --- a/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/redirect.jsp +++ b/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/redirect.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/sso.jsp b/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/sso.jsp index dba518c20c..b3d8cf97b4 100644 --- a/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/sso.jsp +++ b/hyperlink/hyperlink-war/src/main/webapp/hyperlink/jsp/sso.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/hyperlink/pom.xml b/hyperlink/pom.xml index 2657608b89..5f56c91c40 100644 --- a/hyperlink/pom.xml +++ b/hyperlink/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/infoLetter/infoLetter-configuration/pom.xml b/infoLetter/infoLetter-configuration/pom.xml index 1d8583bb39..9fae498a6e 100644 --- a/infoLetter/infoLetter-configuration/pom.xml +++ b/infoLetter/infoLetter-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>infoletter</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.infoletter</groupId> diff --git a/infoLetter/infoLetter-configuration/src/main/config/migrations/modules/infoLetter-migration.xml b/infoLetter/infoLetter-configuration/src/main/config/migrations/modules/infoLetter-migration.xml index 529ac46a79..8486b07ee1 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/migrations/modules/infoLetter-migration.xml +++ b/infoLetter/infoLetter-configuration/src/main/config/migrations/modules/infoLetter-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="infoLetter" diff --git a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle.properties b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle.properties index 895f183b04..0e5ef32f4e 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle.properties +++ b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # infoLetter = Gestionnaire de lettres d'information diff --git a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_de.properties b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_de.properties index f0c8eb9c64..f9f18d72c4 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_de.properties +++ b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # infoLetter = Informationsbrief-Administrator diff --git a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_en.properties b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_en.properties index 00e958c235..2c3862826c 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_en.properties +++ b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # infoLetter = Newsletter Manager diff --git a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_fr.properties b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_fr.properties index e8f1380fbe..a21bab3c16 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_fr.properties +++ b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/multilang/infoLetterBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # infoLetter = Gestionnaire de lettres d'information diff --git a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/infoLetterIcons.properties b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/infoLetterIcons.properties index 4fe4ea7471..10e946b266 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/infoLetterIcons.properties +++ b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/infoLetterIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # infoLetter.add = /util/icons/create-action/add-publication.png infoLetter.abonner = /util/icons/create-action/subscribe-infoletter.png diff --git a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/infoLetterSettings.properties b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/infoLetterSettings.properties index dca9cf3af1..9d9bac9183 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/infoLetterSettings.properties +++ b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/infoLetterSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # showHeader = true diff --git a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/usersCSVFormat.properties b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/usersCSVFormat.properties index 4e69c0717f..3353e88c3a 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/usersCSVFormat.properties +++ b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/infoLetter/settings/usersCSVFormat.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # Columns of CSV files # ------------------- diff --git a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/util/logging/infoLetterLogging.properties b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/util/logging/infoLetterLogging.properties index 7f168f8535..c87aa28475 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/util/logging/infoLetterLogging.properties +++ b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/util/logging/infoLetterLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/wysiwyg/settings/infoLetterSettings.properties b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/wysiwyg/settings/infoLetterSettings.properties index 04ce572822..7c5b5dfabc 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/wysiwyg/settings/infoLetterSettings.properties +++ b/infoLetter/infoLetter-configuration/src/main/config/properties/org/silverpeas/wysiwyg/settings/infoLetterSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # Either the URL of the configuration file or the path of the configuration file relative to the diff --git a/infoLetter/infoLetter-configuration/src/main/config/xmlcomponents/infoLetter.xml b/infoLetter/infoLetter-configuration/src/main/config/xmlcomponents/infoLetter.xml index 42f2528aa3..2e7b98f460 100644 --- a/infoLetter/infoLetter-configuration/src/main/config/xmlcomponents/infoLetter.xml +++ b/infoLetter/infoLetter-configuration/src/main/config/xmlcomponents/infoLetter.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/infoLetter/infoLetter-library/pom.xml b/infoLetter/infoLetter-library/pom.xml index c101fafe8f..7dbbf3e7a2 100644 --- a/infoLetter/infoLetter-library/pom.xml +++ b/infoLetter/infoLetter-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>infoletter</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.infoletter</groupId> diff --git a/infoLetter/infoLetter-library/src/integration-test/java/org/silverpeas/components/infoletter/InfoLetterInstancePreDestructionIT.java b/infoLetter/infoLetter-library/src/integration-test/java/org/silverpeas/components/infoletter/InfoLetterInstancePreDestructionIT.java index e84c9cce68..bdfe31578d 100644 --- a/infoLetter/infoLetter-library/src/integration-test/java/org/silverpeas/components/infoletter/InfoLetterInstancePreDestructionIT.java +++ b/infoLetter/infoLetter-library/src/integration-test/java/org/silverpeas/components/infoletter/InfoLetterInstancePreDestructionIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter; diff --git a/infoLetter/infoLetter-library/src/integration-test/java/org/silverpeas/components/infoletter/test/WarBuilder4InfoLetter.java b/infoLetter/infoLetter-library/src/integration-test/java/org/silverpeas/components/infoletter/test/WarBuilder4InfoLetter.java index ec97cc2a51..8662a276da 100644 --- a/infoLetter/infoLetter-library/src/integration-test/java/org/silverpeas/components/infoletter/test/WarBuilder4InfoLetter.java +++ b/infoLetter/infoLetter-library/src/integration-test/java/org/silverpeas/components/infoletter/test/WarBuilder4InfoLetter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter.test; diff --git a/infoLetter/infoLetter-library/src/integration-test/resources/arquillian.xml b/infoLetter/infoLetter-library/src/integration-test/resources/arquillian.xml index fc68726bc5..ebca1fdd1e 100644 --- a/infoLetter/infoLetter-library/src/integration-test/resources/arquillian.xml +++ b/infoLetter/infoLetter-library/src/integration-test/resources/arquillian.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <arquillian xmlns="http://jboss.org/schema/arquillian" @@ -37,8 +37,8 @@ <container qualifier="wildfly-managed" default="true"> <configuration> <property name="serverConfig">standalone-full.xml</property> - <property name="startupTimeoutInSeconds">120</property> - <property name="allowConnectingToRunningServer">true</property> + <property name="startupTimeoutInSeconds">300</property> + <property name="allowConnectingToRunningServer">false</property> <property name="javaVmArguments">-Xms512M -Xmx2G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</property> <!-- uncomment it for debugging integration test --> <!-- @@ -46,4 +46,4 @@ --> </configuration> </container> -</arquillian> \ No newline at end of file +</arquillian> diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterContentManager.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterContentManager.java index 4628d4bd00..8c378bb5c7 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterContentManager.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter; diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterException.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterException.java index 5f8b28d752..f0511cf8de 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterException.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* * InfoLetterException.java diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterInstancePostConstruction.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterInstancePostConstruction.java index bab438b07f..993d3e0172 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterInstancePostConstruction.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter; diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterInstancePreDestruction.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterInstancePreDestruction.java index f7037075d7..8c00fde7ef 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterInstancePreDestruction.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter; diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterPeasTrappedException.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterPeasTrappedException.java index 5d89f53936..5db7a8f77a 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterPeasTrappedException.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterPeasTrappedException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /*--- formatted by Jindent 2.1, (www.c-lab.de/~jindent) ---*/ diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterStatistics.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterStatistics.java index 9d7528f0fa..90b47e74cb 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterStatistics.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/InfoLetterStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /*--- formatted by Jindent 2.1, (www.c-lab.de/~jindent) ---*/ diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/implementation/InfoLetterDataManager.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/implementation/InfoLetterDataManager.java index 3892ae6ef4..9c409894a4 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/implementation/InfoLetterDataManager.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/implementation/InfoLetterDataManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter.implementation; diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetter.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetter.java index e9d09748ba..24a5ad4674 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetter.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter.model; diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterPublication.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterPublication.java index eb6810deea..5cba500cbc 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterPublication.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterPublication.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter.model; diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterPublicationPdC.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterPublicationPdC.java index 7fb97ea89f..c0a4a5023f 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterPublicationPdC.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterPublicationPdC.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter.model; diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterService.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterService.java index 3d975b7c0e..47eda695b7 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterService.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter.model; diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/notification/InfoLetterSubscriptionPublicationUserNotification.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/notification/InfoLetterSubscriptionPublicationUserNotification.java index e5ebbe7190..10e6958b99 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/notification/InfoLetterSubscriptionPublicationUserNotification.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/notification/InfoLetterSubscriptionPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter.notification; diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/service/ByteArrayDataSource.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/service/ByteArrayDataSource.java index 557d90e6f7..04ebc67633 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/service/ByteArrayDataSource.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/service/ByteArrayDataSource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ // *** Rajoute par F. Rageade pour compilation du SessionController package org.silverpeas.components.infoletter.service; diff --git a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/service/InfoLetterServiceProvider.java b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/service/InfoLetterServiceProvider.java index 442ea68b14..a1e30af226 100644 --- a/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/service/InfoLetterServiceProvider.java +++ b/infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/service/InfoLetterServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /******************************* *** ServiceFactory *** diff --git a/infoLetter/infoLetter-war/pom.xml b/infoLetter/infoLetter-war/pom.xml index fed084ee67..0de76c996f 100644 --- a/infoLetter/infoLetter-war/pom.xml +++ b/infoLetter/infoLetter-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>infoletter</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.infoletter</groupId> diff --git a/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/control/InfoLetterSessionController.java b/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/control/InfoLetterSessionController.java index 9a45dff687..2752aadb89 100644 --- a/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/control/InfoLetterSessionController.java +++ b/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/control/InfoLetterSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter.control; @@ -35,6 +35,7 @@ import org.silverpeas.components.infoletter.service.InfoLetterServiceProvider; import org.silverpeas.core.WAPrimaryKey; import org.silverpeas.core.admin.user.model.Group; +import org.silverpeas.core.admin.user.model.User; import org.silverpeas.core.admin.user.model.UserDetail; import org.silverpeas.core.contribution.content.wysiwyg.service.WysiwygController; import org.silverpeas.core.exception.DecodingException; @@ -70,12 +71,13 @@ import java.io.IOException; import java.io.InputStream; import java.text.ParseException; -import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.StringTokenizer; +import java.util.stream.Stream; +import static java.util.stream.Collectors.toCollection; import static org.silverpeas.core.pdc.pdc.model.PdcClassification.aPdcClassificationOfContent; /** @@ -560,19 +562,13 @@ public boolean exportCsvEmails() throws IOException, InfoLetterException { * @return Set of emails */ private Set<String> getEmailsManagers() { - Set<String> emails = new LinkedHashSet<>(); - List<String> roles = new ArrayList<>(); - roles.add("admin"); - String[] userIds = getOrganisationController().getUsersIdsByRoleNames(getComponentId(), roles); - if (userIds != null) { - for (String userId : userIds) { - String email = getUserDetail(userId).geteMail(); - if (StringUtil.isDefined(email)) { - emails.add(email); - } - } - } - return emails; + final List<String> roles = List.of("admin"); + return Stream.of(getOrganisationController().getUsersIdsByRoleNames(getComponentId(), roles)) + .map(this::getUserDetail) + .filter(User::isValidState) + .map(User::geteMail) + .filter(StringUtil::isDefined) + .collect(toCollection(LinkedHashSet::new)); } /** diff --git a/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/servlets/GoToNewsletter.java b/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/servlets/GoToNewsletter.java index 17eba44ea6..984c11e442 100644 --- a/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/servlets/GoToNewsletter.java +++ b/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/servlets/GoToNewsletter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter.servlets; diff --git a/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/servlets/InfoLetterRequestRouter.java b/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/servlets/InfoLetterRequestRouter.java index 0dc504f197..41afdabe2a 100644 --- a/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/servlets/InfoLetterRequestRouter.java +++ b/infoLetter/infoLetter-war/src/main/java/org/silverpeas/components/infoletter/servlets/InfoLetterRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.infoletter.servlets; diff --git a/infoLetter/infoLetter-war/src/main/webapp/WEB-INF/web.xml b/infoLetter/infoLetter-war/src/main/webapp/WEB-INF/web.xml index fa5f9253e3..6f617f98e0 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/WEB-INF/web.xml +++ b/infoLetter/infoLetter-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/addEmail.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/addEmail.jsp index 117c544c83..ad3e7931f6 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/addEmail.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/addEmail.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/attachedFiles.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/attachedFiles.jsp index 636a885cc2..19cd1bed3e 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/attachedFiles.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/attachedFiles.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/check.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/check.jsp index f81d49d0e8..1304c31755 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/check.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/editLetter.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/editLetter.jsp index 51966b0383..a1eae43721 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/editLetter.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/editLetter.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/emailsManager.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/emailsManager.jsp index 7efc2135a0..e544f6d8e7 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/emailsManager.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/emailsManager.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.util.WebEncodeHelper" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/exportEmailsCsv.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/exportEmailsCsv.jsp index 887369f8fa..86fe43f6bd 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/exportEmailsCsv.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/exportEmailsCsv.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/headerLetter.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/headerLetter.jsp index 3693d4bb48..4d893f7f80 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/headerLetter.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/headerLetter.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/importEmailsCsv.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/importEmailsCsv.jsp index 4b198579f2..f5482701b2 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/importEmailsCsv.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/importEmailsCsv.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/infoLetterSended.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/infoLetterSended.jsp index 5c352f0b6d..eb3ac193c0 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/infoLetterSended.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/infoLetterSended.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/listLetterAdmin.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/listLetterAdmin.jsp index 40e96a4fa6..66b8eb70a5 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/listLetterAdmin.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/listLetterAdmin.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/listLetterUser.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/listLetterUser.jsp index 2794432252..4a779cfc30 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/listLetterUser.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/listLetterUser.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/modifHeaders.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/modifHeaders.jsp index 5dbb610f28..1acbfe384c 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/modifHeaders.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/modifHeaders.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/portletListLetterAdmin.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/portletListLetterAdmin.jsp index 7e7ca22289..f1ed20a28e 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/portletListLetterAdmin.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/portletListLetterAdmin.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/portletListLetterUser.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/portletListLetterUser.jsp index f40a240a76..d2bf6a012c 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/portletListLetterUser.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/portletListLetterUser.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/previewLetter.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/previewLetter.jsp index 956312104a..c56315c958 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/previewLetter.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/previewLetter.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/styleSheets/infoLetter.css b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/styleSheets/infoLetter.css index fda7633c5e..b384fcf856 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/styleSheets/infoLetter.css +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/styleSheets/infoLetter.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ .infoletter fieldset#infoFieldset legend { diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/template.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/template.jsp index 53b2b74872..570744cbaf 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/template.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/template.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/viewLetter.jsp b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/viewLetter.jsp index 2538e540fc..9aa3ff7b3b 100644 --- a/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/viewLetter.jsp +++ b/infoLetter/infoLetter-war/src/main/webapp/infoLetter/jsp/viewLetter.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view"%> diff --git a/infoLetter/pom.xml b/infoLetter/pom.xml index da07afe3ab..8e45623089 100644 --- a/infoLetter/pom.xml +++ b/infoLetter/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/jdbcConnector/jdbcConnector-configuration/pom.xml b/jdbcConnector/jdbcConnector-configuration/pom.xml index b9496d8eb8..787118ffc9 100644 --- a/jdbcConnector/jdbcConnector-configuration/pom.xml +++ b/jdbcConnector/jdbcConnector-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>jdbcconnector</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.jdbcconnector</groupId> diff --git a/jdbcConnector/jdbcConnector-configuration/src/main/config/migrations/modules/connecteurJDBC-migration.xml b/jdbcConnector/jdbcConnector-configuration/src/main/config/migrations/modules/connecteurJDBC-migration.xml index d44b18cddc..1668a78197 100644 --- a/jdbcConnector/jdbcConnector-configuration/src/main/config/migrations/modules/connecteurJDBC-migration.xml +++ b/jdbcConnector/jdbcConnector-configuration/src/main/config/migrations/modules/connecteurJDBC-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <migration module="connecteurJDBC" xmlns="http://silverpeas.org/xml/ns/migration" diff --git a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector.properties b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector.properties index c21c977a69..c5b563648b 100644 --- a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector.properties +++ b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # erreurParametresConnectionIncorrects = param\u00e8tres de connexion incorrects erreurChampsTropLong = champ trop long diff --git a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_de.properties b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_de.properties index 1d5313d217..54dc20822b 100644 --- a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_de.properties +++ b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # erreurParametresConnectionIncorrects = Verbindungsparameter falsch diff --git a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_en.properties b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_en.properties index ac0796e206..457579930a 100644 --- a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_en.properties +++ b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # parametresConnectionIncorrects = wrong connexion settings erreurChampsTropLong = Too many characters diff --git a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_fr.properties b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_fr.properties index 622706675a..cc7dc0c5b6 100644 --- a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_fr.properties +++ b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/multilang/jdbcConnector_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # erreurParametresConnectionIncorrects = param\u00e8tres de connexion incorrects erreurChampsTropLong = champ trop long diff --git a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/settings/dataSources.properties b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/settings/dataSources.properties index 2867b64b3e..6dfcc299d8 100644 --- a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/settings/dataSources.properties +++ b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/jdbcConnector/settings/dataSources.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify it under the terms of the # GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ # redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") # applications as described in Silverpeas's FLOSS exception. You should have received a copy of the # text describing the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License along with this program. -# If not, see <http://www.gnu.org/licenses/>. +# If not, see <https://www.gnu.org/licenses/>. # # number of configured data sources diff --git a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/util/logging/jdbcConnectorLogging.properties b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/util/logging/jdbcConnectorLogging.properties index 5559c6974a..53fcbc6343 100644 --- a/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/util/logging/jdbcConnectorLogging.properties +++ b/jdbcConnector/jdbcConnector-configuration/src/main/config/properties/org/silverpeas/util/logging/jdbcConnectorLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/jdbcConnector/jdbcConnector-configuration/src/main/config/xmlcomponents/connecteurJDBC.xml b/jdbcConnector/jdbcConnector-configuration/src/main/config/xmlcomponents/connecteurJDBC.xml index 640938f29f..0e0669df5b 100644 --- a/jdbcConnector/jdbcConnector-configuration/src/main/config/xmlcomponents/connecteurJDBC.xml +++ b/jdbcConnector/jdbcConnector-configuration/src/main/config/xmlcomponents/connecteurJDBC.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/jdbcConnector/jdbcConnector-library/pom.xml b/jdbcConnector/jdbcConnector-library/pom.xml index d1d01e2cf5..5c9d1271dd 100644 --- a/jdbcConnector/jdbcConnector-library/pom.xml +++ b/jdbcConnector/jdbcConnector-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>jdbcconnector</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.jdbcconnector</groupId> diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/ConnecteurJDBCInstancePreDestruction.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/ConnecteurJDBCInstancePreDestruction.java index a4bd64db2c..cc7e6d6a8c 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/ConnecteurJDBCInstancePreDestruction.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/ConnecteurJDBCInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceConnectionInfo.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceConnectionInfo.java index 0195847b38..94efa92253 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceConnectionInfo.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceConnectionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.model; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceConnectionInfoRepository.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceConnectionInfoRepository.java index 58644fea53..e764ed13c6 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceConnectionInfoRepository.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceConnectionInfoRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.model; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceDefinition.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceDefinition.java index b6f7cb850e..2254f30d3b 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceDefinition.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/model/DataSourceDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.model; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/package-info.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/package-info.java index d009918074..1e477c328b 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/package-info.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /** diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/DataSourceConnectionInfoService.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/DataSourceConnectionInfoService.java index 517d71644d..65bb55f1e8 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/DataSourceConnectionInfoService.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/DataSourceConnectionInfoService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcConnectorException.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcConnectorException.java index 3f8bb77ae4..2ac421d38d 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcConnectorException.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcConnectorException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcConnectorRuntimeException.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcConnectorRuntimeException.java index 2d088e9337..ec986a1854 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcConnectorRuntimeException.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcConnectorRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcRequester.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcRequester.java index ab0a39ce6e..b206ef0ffe 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcRequester.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/JdbcRequester.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/SimpleDataSourceConnectionInfoService.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/SimpleDataSourceConnectionInfoService.java index ccb9fbdba7..b32d42cb7f 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/SimpleDataSourceConnectionInfoService.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/SimpleDataSourceConnectionInfoService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/TableFieldValue.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/TableFieldValue.java index c1604fc112..901fcee928 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/TableFieldValue.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/TableFieldValue.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/TableRow.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/TableRow.java index b2876702ae..68407698ef 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/TableRow.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/TableRow.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Equality.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Equality.java index 5d1bdaadb3..be555cdad3 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Equality.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Equality.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service.comparators; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/FieldValueComparator.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/FieldValueComparator.java index 01447c0d51..ce48a566eb 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/FieldValueComparator.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/FieldValueComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service.comparators; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inclusion.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inclusion.java index f782e272bf..cf75e799a8 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inclusion.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inclusion.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service.comparators; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inequality.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inequality.java index a197b99016..07ec7d8a27 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inequality.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inequality.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service.comparators; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inferiority.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inferiority.java index 311fb5f986..1b2995747f 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inferiority.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Inferiority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service.comparators; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Like.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Like.java index e9fc89932c..95f6dcadaa 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Like.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Like.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service.comparators; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/NothingBuilder.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/NothingBuilder.java index 4e0bc0a1b2..cc93b28bf7 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/NothingBuilder.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/NothingBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service.comparators; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/StrictInferiority.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/StrictInferiority.java index 8b44b00382..91ccda5d84 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/StrictInferiority.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/StrictInferiority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service.comparators; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/StrictSuperiority.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/StrictSuperiority.java index 771bcc256f..bb696d8855 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/StrictSuperiority.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/StrictSuperiority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service.comparators; diff --git a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Superiority.java b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Superiority.java index 1e7e519f3a..f125d04b0f 100644 --- a/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Superiority.java +++ b/jdbcConnector/jdbcConnector-library/src/main/java/org/silverpeas/components/jdbcconnector/service/comparators/Superiority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.service.comparators; diff --git a/jdbcConnector/jdbcConnector-war/pom.xml b/jdbcConnector/jdbcConnector-war/pom.xml index a0eff424d0..470296a11e 100644 --- a/jdbcConnector/jdbcConnector-war/pom.xml +++ b/jdbcConnector/jdbcConnector-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>jdbcconnector</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.jdbcconnector</groupId> diff --git a/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/JdbcConnectorWebController.java b/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/JdbcConnectorWebController.java index 658e5b5f4d..b128fd11d6 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/JdbcConnectorWebController.java +++ b/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/JdbcConnectorWebController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.control; diff --git a/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/JdbcConnectorWebRequestContext.java b/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/JdbcConnectorWebRequestContext.java index 3530b9a0f0..947c92d7e7 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/JdbcConnectorWebRequestContext.java +++ b/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/JdbcConnectorWebRequestContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.control; diff --git a/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/QueryResult.java b/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/QueryResult.java index 70b5f633f2..961cdf53e0 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/QueryResult.java +++ b/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/QueryResult.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.control; diff --git a/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/TableRowsFilter.java b/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/TableRowsFilter.java index 94af273a44..d6344eb0dc 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/TableRowsFilter.java +++ b/jdbcConnector/jdbcConnector-war/src/main/java/org/silverpeas/components/jdbcconnector/control/TableRowsFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.jdbcconnector.control; diff --git a/jdbcConnector/jdbcConnector-war/src/main/webapp/WEB-INF/web.xml b/jdbcConnector/jdbcConnector-war/src/main/webapp/WEB-INF/web.xml index de6f7091e9..80257fafe6 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/webapp/WEB-INF/web.xml +++ b/jdbcConnector/jdbcConnector-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describingé"é& the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/head.jsp b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/head.jsp index db9f850e90..3d2f90ccc2 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/head.jsp +++ b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/head.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <% diff --git a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/jdbcConnector.jsp b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/jdbcConnector.jsp index c31d932878..09b2d77750 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/jdbcConnector.jsp +++ b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/jdbcConnector.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.components.jdbcconnector.service.comparators.Equality" %> diff --git a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/portlet.jsp b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/portlet.jsp index 14aac91927..5624779596 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/portlet.jsp +++ b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/portlet.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.components.jdbcconnector.service.comparators.Equality" %> diff --git a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/requestEditor.jsp b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/requestEditor.jsp index f082a183cd..bcf918ce6f 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/requestEditor.jsp +++ b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/requestEditor.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="head.jsp" %> diff --git a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/requestParameters.jsp b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/requestParameters.jsp index 0aa1931676..c6492ba7ea 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/requestParameters.jsp +++ b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/requestParameters.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="head.jsp" %> diff --git a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/styleSheets/connecteurJDBC.css b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/styleSheets/connecteurJDBC.css index 576eee25e5..4c588ba997 100644 --- a/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/styleSheets/connecteurJDBC.css +++ b/jdbcConnector/jdbcConnector-war/src/main/webapp/connecteurJDBC/jsp/styleSheets/connecteurJDBC.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ .break-line { display: block; diff --git a/jdbcConnector/pom.xml b/jdbcConnector/pom.xml index 8ae3f6dc5a..d42fcf720d 100644 --- a/jdbcConnector/pom.xml +++ b/jdbcConnector/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/kmelia/kmelia-configuration/pom.xml b/kmelia/kmelia-configuration/pom.xml index caff52b0ce..0392496997 100644 --- a/kmelia/kmelia-configuration/pom.xml +++ b/kmelia/kmelia-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>kmelia</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.kmelia</groupId> diff --git a/kmelia/kmelia-configuration/src/main/config/migrations/modules/kmelia-migration.xml b/kmelia/kmelia-configuration/src/main/config/migrations/modules/kmelia-migration.xml index 73bc1d415b..668a650b5f 100644 --- a/kmelia/kmelia-configuration/src/main/config/migrations/modules/kmelia-migration.xml +++ b/kmelia/kmelia-configuration/src/main/config/migrations/modules/kmelia-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="kmelia" diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/messages/kmeliaMessages.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/messages/kmeliaMessages.properties index 788e1ea3d5..1be83e3150 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/messages/kmeliaMessages.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/messages/kmeliaMessages.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # kmelia.IMPOSSIBLE_DE_FABRIQUER_NODEBM_HOME = Impossible de cr�er le service NodeBmHome kmelia.IMPOSSIBLE_DE_FABRIQUER_PUBLICATIONBM_HOME = Impossible de cr�er le service PublicationBmHome diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle.properties index dfcc96540a..9c04c61042 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # Consultation=Consultation @@ -370,10 +370,9 @@ kmelia.stat.result.period=Statistiques sur la p\u00e9riode du {0} au {1} kmelia.stat.result.fieldset.period=Statistiques d'activit\u00e9s kmelia.stat.result.fieldset.search=Statistiques de recherches -kmelia.paths.local = Emplacements locaux -kmelia.paths.path = emplacement -kmelia.paths.paths = emplacements -kmelia.paths.mandatory = Un emplacement local est obligatoire ! +kmelia.paths.local = <strong>Les emplacements</strong> actuels +kmelia.paths.local.add = <strong>D\u00e9finir des emplacements suppl\u00e9mentaires</strong> dans l'application actuelle +kmelia.paths.external.add = <strong>D\u00e9finir des emplacements suppl\u00e9mentaires</strong> dans d'autres applications kmelia.drag.publication.success1 = La publication <b> kmelia.drag.publication.success2 = </b> a \u00e9t\u00e9 d\u00e9plac\u00e9e avec succ\u00e8s... @@ -444,4 +443,4 @@ kmelia.notif.subject.folder.update = Dossier modifi\u00e9 kmelia.notif.subject.folder=\u00c0 propos du dossier $topicName$$ kmelia.copy.state.help=L'\u00e9tat s\u00e9lectionn\u00e9 sera appliqu\u00e9 uniquement sur les publications dupliqu\u00e9es kmelia.sort.manual=Ordre manuel -kmelia.sort.manual.reset=kmelia.sort.manual.reset \ No newline at end of file +kmelia.sort.manual.reset=kmelia.sort.manual.reset diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_de.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_de.properties index 9eeb37b7fe..2b2e9f8e2f 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_de.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # CreerSousTheme = Ein Thema erstellen @@ -427,10 +427,9 @@ kmelia.stat.result.period=Statistiken f\u00fcr den Zeitraum von {0} auf {1} kmelia.stat.result.fieldset.period=Aktivit\u00e4ten-Statistiken kmelia.stat.result.fieldset.search=Such-Statistiken -kmelia.paths.local = Local locations -kmelia.paths.path = location -kmelia.paths.paths = locations -kmelia.paths.mandatory = Ein lokaler Standort ist erforderlich ! +kmelia.paths.local = <strong>Aktuelle</strong> Standorte +kmelia.paths.local.add = <strong>Weitere Standorte festlegen</strong> in der aktuellen Anwendung +kmelia.paths.external.add = <strong>Legen Sie zus\u00e4tzliche Standorte fest</strong> in anderen Apps kmelia.drag.publication.success1 = Publication <b> kmelia.drag.publication.success2 = </b> was moved successfully... @@ -497,4 +496,4 @@ kmelia.notif.subject.folder.update = Ge\u00e4nderter Ordner kmelia.notif.subject.folder=\u00fcber den Ordner $topicName$ kmelia.copy.state.help=Selected state will be used only for duplicated publications kmelia.sort.manual=Manuelle Bestellung -kmelia.sort.manual.reset=Manuelle Bestellung entfernen \ No newline at end of file +kmelia.sort.manual.reset=Manuelle Bestellung entfernen diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_en.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_en.properties index 88b3c0ec12..3b0c4a0260 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_en.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # Theme = Folder @@ -424,10 +424,9 @@ kmelia.stat.result.period=Period statistics from {0} to {1} kmelia.stat.result.fieldset.period=Activity statistics kmelia.stat.result.fieldset.search=Search statistics -kmelia.paths.local = Local locations -kmelia.paths.path = location -kmelia.paths.paths = locations -kmelia.paths.mandatory = A local location is required! +kmelia.paths.local = <strong>Current</strong> locations +kmelia.paths.local.add = <strong>Set additional locations</strong> in the current application +kmelia.paths.external.add = <strong>Set additional locations</strong> in other apps kmelia.drag.publication.success1 = Publication <b> kmelia.drag.publication.success2 = </b> was moved successfully... @@ -493,4 +492,4 @@ kmelia.notif.subject.folder.update = Updated folder kmelia.notif.subject.folder=About the folder $topicName$ kmelia.copy.state.help=Selected state will be used only for duplicated publications kmelia.sort.manual=Manual order -kmelia.sort.manual.reset=Delete manual order \ No newline at end of file +kmelia.sort.manual.reset=Delete manual order diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_fr.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_fr.properties index 7ec689d4d4..07275760c8 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_fr.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # Consultation=Consultation @@ -373,10 +373,9 @@ kmelia.stat.result.period=Statistiques sur la p\u00e9riode du {0} au {1} kmelia.stat.result.fieldset.period=Statistiques d'activit\u00e9s kmelia.stat.result.fieldset.search=Statistiques de recherches -kmelia.paths.local = Emplacements locaux -kmelia.paths.path = emplacement -kmelia.paths.paths = emplacements -kmelia.paths.mandatory = Un emplacement local est obligatoire ! +kmelia.paths.local = <strong>Les emplacements</strong> actuels +kmelia.paths.local.add = <strong>D\u00e9finir des emplacements suppl\u00e9mentaires</strong> dans l'application actuelle +kmelia.paths.external.add = <strong>D\u00e9finir des emplacements suppl\u00e9mentaires</strong> dans d'autres applications kmelia.drag.publication.success1 = La publication <b> kmelia.drag.publication.success2 = </b> a \u00e9t\u00e9 d\u00e9plac\u00e9e avec succ\u00e8s... @@ -445,4 +444,4 @@ kmelia.copy.state.help=L'\u00e9tat s\u00e9lectionn\u00e9 sera appliqu\u00e9 uniq kmelia.sort.manual = Ordre manuel kmelia.sort.manual.reset = Supprimer l'ordre manuel -kmelia.sort.manual.reset.confirm = Etes-vous s\u00fbr(e) de vouloir supprimer d\u00e9finitivement l'ordre manuel et revenir \u00e0 l'ordre par d\u00e9faut ? \ No newline at end of file +kmelia.sort.manual.reset.confirm = Etes-vous s\u00fbr(e) de vouloir supprimer d\u00e9finitivement l'ordre manuel et revenir \u00e0 l'ordre par d\u00e9faut ? diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport.properties index 32c9d4805c..56defb5265 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -10,7 +10,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +18,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # This resource bundle defines the translated text for the ODT document to generate from a given diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_de.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_de.properties index 4a1a201188..4de0dbf010 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_de.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_de.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -10,7 +10,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +18,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # This resource bundle defines the translated text for the ODT document to generate from a given diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_en.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_en.properties index b229e26e81..b2bc477dae 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_en.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_en.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -10,7 +10,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +18,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # This resource bundle defines the translated text for the ODT document to generate from a given diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_fr.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_fr.properties index 32c9d4805c..56defb5265 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_fr.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaExport_fr.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -10,7 +10,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +18,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # This resource bundle defines the translated text for the ODT document to generate from a given diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle.properties index ac3a982ead..b442133691 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # 0 = Aujourd'hui 7 = Derni\u00E8re semaine diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_de.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_de.properties index c3893b8357..394e69a63e 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_de.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # 0 = Heute diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_en.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_en.properties index 27e8bcdd5b..b93f1f303f 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_en.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # 0 = Today 7 = Less than a week diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_fr.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_fr.properties index a200663aac..d5b02a0d49 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_fr.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/timeAxisBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # 0 = Aujourd'hui diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/settings/kmeliaIcons.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/settings/kmeliaIcons.properties index 7bde71dca5..04ad88b5e0 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/settings/kmeliaIcons.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/settings/kmeliaIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # kmelia.link = /util/icons/link.gif kmelia.1px = /util/icons/colorPix/1px.gif diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/settings/kmeliaSettings.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/settings/kmeliaSettings.properties index e6d187c277..10b2f9593c 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/settings/kmeliaSettings.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/settings/kmeliaSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # HomeNbPublications = 15 HomeNbCols = 3 diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/util/logging/kmaxLogging.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/util/logging/kmaxLogging.properties index 5a9a0ce0f0..c41e8f1137 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/util/logging/kmaxLogging.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/util/logging/kmaxLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/util/logging/kmeliaLogging.properties b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/util/logging/kmeliaLogging.properties index c81be52e55..d6ee8964f3 100644 --- a/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/util/logging/kmeliaLogging.properties +++ b/kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/util/logging/kmeliaLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/kmelia/kmelia-configuration/src/main/config/xmlcomponents/kmax.xml b/kmelia/kmelia-configuration/src/main/config/xmlcomponents/kmax.xml index e1a6fb290b..2fb929a570 100644 --- a/kmelia/kmelia-configuration/src/main/config/xmlcomponents/kmax.xml +++ b/kmelia/kmelia-configuration/src/main/config/xmlcomponents/kmax.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <WAComponent xmlns="http://silverpeas.org/xml/ns/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/kmelia/kmelia-configuration/src/main/config/xmlcomponents/kmelia.xml b/kmelia/kmelia-configuration/src/main/config/xmlcomponents/kmelia.xml index 3afaf201f3..ac6fdc6e71 100644 --- a/kmelia/kmelia-configuration/src/main/config/xmlcomponents/kmelia.xml +++ b/kmelia/kmelia-configuration/src/main/config/xmlcomponents/kmelia.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/kmelia/kmelia-configuration/src/main/config/xmlcomponents/toolbox.xml b/kmelia/kmelia-configuration/src/main/config/xmlcomponents/toolbox.xml index 364030ca26..cf3f79aa89 100644 --- a/kmelia/kmelia-configuration/src/main/config/xmlcomponents/toolbox.xml +++ b/kmelia/kmelia-configuration/src/main/config/xmlcomponents/toolbox.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/kmelia/kmelia-library/pom.xml b/kmelia/kmelia-library/pom.xml index 102c1e4989..4fa3f7a6ca 100644 --- a/kmelia/kmelia-library/pom.xml +++ b/kmelia/kmelia-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>kmelia</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.kmelia</groupId> @@ -55,8 +55,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> </dependency> <dependency> <groupId>org.silverpeas.core</groupId> diff --git a/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/dao/TopicSearchDaoIT.java b/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/dao/TopicSearchDaoIT.java index 843138de88..faeb2437cb 100644 --- a/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/dao/TopicSearchDaoIT.java +++ b/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/dao/TopicSearchDaoIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.dao; diff --git a/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/repository/TopicSearchRepositoryIT.java b/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/repository/TopicSearchRepositoryIT.java index 9a082beeec..e846398b5c 100644 --- a/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/repository/TopicSearchRepositoryIT.java +++ b/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/repository/TopicSearchRepositoryIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.repository; diff --git a/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/search/KmeliaSearchServiceProviderIT.java b/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/search/KmeliaSearchServiceProviderIT.java index 3a67742fef..a2c3c92e9e 100644 --- a/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/search/KmeliaSearchServiceProviderIT.java +++ b/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/search/KmeliaSearchServiceProviderIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.search; diff --git a/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/search/TopicSearchServiceIT.java b/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/search/TopicSearchServiceIT.java index a8dace771e..db7a37667e 100644 --- a/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/search/TopicSearchServiceIT.java +++ b/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/search/TopicSearchServiceIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.search; diff --git a/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/test/WarBuilder4Kmelia.java b/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/test/WarBuilder4Kmelia.java index a6a72db564..e2bf9231f5 100644 --- a/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/test/WarBuilder4Kmelia.java +++ b/kmelia/kmelia-library/src/integration-test/java/org/silverpeas/components/kmelia/test/WarBuilder4Kmelia.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.test; diff --git a/kmelia/kmelia-library/src/integration-test/resources/arquillian.xml b/kmelia/kmelia-library/src/integration-test/resources/arquillian.xml index fc68726bc5..ebca1fdd1e 100644 --- a/kmelia/kmelia-library/src/integration-test/resources/arquillian.xml +++ b/kmelia/kmelia-library/src/integration-test/resources/arquillian.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <arquillian xmlns="http://jboss.org/schema/arquillian" @@ -37,8 +37,8 @@ <container qualifier="wildfly-managed" default="true"> <configuration> <property name="serverConfig">standalone-full.xml</property> - <property name="startupTimeoutInSeconds">120</property> - <property name="allowConnectingToRunningServer">true</property> + <property name="startupTimeoutInSeconds">300</property> + <property name="allowConnectingToRunningServer">false</property> <property name="javaVmArguments">-Xms512M -Xmx2G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</property> <!-- uncomment it for debugging integration test --> <!-- @@ -46,4 +46,4 @@ --> </configuration> </container> -</arquillian> \ No newline at end of file +</arquillian> diff --git a/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/dao/kmelia-dataset.xml b/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/dao/kmelia-dataset.xml index 4d9694624f..ac00453751 100644 --- a/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/dao/kmelia-dataset.xml +++ b/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/dao/kmelia-dataset.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/repository/kmelia-dataset.xml b/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/repository/kmelia-dataset.xml index 4d9694624f..ac00453751 100644 --- a/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/repository/kmelia-dataset.xml +++ b/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/repository/kmelia-dataset.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/search/kmelia-dataset.xml b/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/search/kmelia-dataset.xml index 79e012dc8a..d3586d2a0e 100644 --- a/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/search/kmelia-dataset.xml +++ b/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/components/kmelia/search/kmelia-dataset.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,12 +20,12 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -37,7 +37,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -45,7 +45,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/kmelia/settings/kmeliaSettings.properties b/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/kmelia/settings/kmeliaSettings.properties index 3bafcf9bfc..be63b61573 100644 --- a/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/kmelia/settings/kmeliaSettings.properties +++ b/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/kmelia/settings/kmeliaSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # HomeNbPublications = 15 HomeNbCols = 3 diff --git a/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/publication/publicationSettings.properties b/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/publication/publicationSettings.properties index 2885a8586b..c39af6a3b6 100644 --- a/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/publication/publicationSettings.properties +++ b/kmelia/kmelia-library/src/integration-test/resources/org/silverpeas/publication/publicationSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # attachmentsSubDirectory = attachments imagesSubDirectory = images diff --git a/kmelia/kmelia-library/src/integration-test/resources/test-ds.xml b/kmelia/kmelia-library/src/integration-test/resources/test-ds.xml index eaddc0bfad..55db3df229 100644 --- a/kmelia/kmelia-library/src/integration-test/resources/test-ds.xml +++ b/kmelia/kmelia-library/src/integration-test/resources/test-ds.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <datasources xmlns="http://www.jboss.org/ironjacamar/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmax/KmaxException.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmax/KmaxException.java index 357eaa2d41..ca6545d54c 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmax/KmaxException.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmax/KmaxException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmax; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmax/KmaxStatistics.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmax/KmaxStatistics.java index c1bacb0a11..c43de54f3e 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmax/KmaxStatistics.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmax/KmaxStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmax; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/InstanceParameters.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/InstanceParameters.java index 4bfb9254a8..67fa0a3b49 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/InstanceParameters.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/InstanceParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmaxInstancePostConstruction.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmaxInstancePostConstruction.java index f90bfd9b5e..5f0c4b8a49 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmaxInstancePostConstruction.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmaxInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaComponentAuthorization.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaComponentAuthorization.java index ddfedb8ebe..0d7bdd014b 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaComponentAuthorization.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaComponentAuthorization.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaContentManager.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaContentManager.java index cba8769fa5..962da26ecd 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaContentManager.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaCopyDetail.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaCopyDetail.java index 035d1faf60..a5c7a79598 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaCopyDetail.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaCopyDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; @@ -119,7 +119,7 @@ public boolean isPublicationPositionsMustBeCopied() { } public boolean isNodeRightsMustBeCopied() { - return getOptions() != null && StringUtil.getBooleanValue(getOptions().get(NODE_RIGHTS)); + return isMustBeCopied(NODE_RIGHTS); } private boolean isMustBeCopied(String optionName) { @@ -130,4 +130,4 @@ public boolean isAdministrativeOperation() { return getOptions() != null && StringUtil.getBooleanValue(getOptions().get(ADMINISTRATIVE_OPERATION)); } -} \ No newline at end of file +} diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaException.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaException.java index b1a11c6e6a..3bd4c11f9e 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaException.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaGlobalSilverpeasContentProcessor.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaGlobalSilverpeasContentProcessor.java index a04cd4175e..f29df98914 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaGlobalSilverpeasContentProcessor.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaGlobalSilverpeasContentProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaInstancePostConstruction.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaInstancePostConstruction.java index a3ac498118..895b07c303 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaInstancePostConstruction.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaPublicationHelper.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaPublicationHelper.java index 4501c1a2b6..49f7346670 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaPublicationHelper.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaPublicationHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaResourcePasting.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaResourcePasting.java index 0421208f38..ead4b31a06 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaResourcePasting.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaResourcePasting.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaStatistics.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaStatistics.java index c4479951eb..632da5e578 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaStatistics.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/KmeliaStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/PublicationImport.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/PublicationImport.java index c43f5be561..233fff0d8b 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/PublicationImport.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/PublicationImport.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/ToolboxInstancePostConstruction.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/ToolboxInstancePostConstruction.java index 93413badb7..43a5491418 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/ToolboxInstancePostConstruction.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/ToolboxInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/dao/TopicSearchDao.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/dao/TopicSearchDao.java index d1df36a5be..ee3fe52963 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/dao/TopicSearchDao.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/dao/TopicSearchDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.dao; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/dao/TopicSearchDaoImpl.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/dao/TopicSearchDaoImpl.java index a7177efa9e..36352b8054 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/dao/TopicSearchDaoImpl.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/dao/TopicSearchDaoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.dao; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/FileDetail.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/FileDetail.java index 66b4c04cd2..a0186097e6 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/FileDetail.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/FileDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/FileFolder.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/FileFolder.java index 5af2f97ea0..6dad57797c 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/FileFolder.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/FileFolder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmaxRuntimeException.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmaxRuntimeException.java index b891fb8fc9..484b730c0b 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmaxRuntimeException.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmaxRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaPublication.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaPublication.java index f3e91a1cfb..327265695f 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaPublication.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaPublication.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaPublicationComparator.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaPublicationComparator.java index ffe45044f3..9e14b1fbab 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaPublicationComparator.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaPublicationComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaRuntimeException.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaRuntimeException.java index cc07ea98f4..ff8da640dd 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaRuntimeException.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/KmeliaRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/MostInterestedQueryVO.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/MostInterestedQueryVO.java index 20fb982e70..2c41ed92de 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/MostInterestedQueryVO.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/MostInterestedQueryVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliAuthorComparatorAsc.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliAuthorComparatorAsc.java index 445c8927ab..6aadf5e94b 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliAuthorComparatorAsc.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliAuthorComparatorAsc.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliCreationDateComparatorAsc.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliCreationDateComparatorAsc.java index bba18f8f5f..f30659cf09 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliCreationDateComparatorAsc.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliCreationDateComparatorAsc.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliImportanceComparatorDesc.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliImportanceComparatorDesc.java index 08655c098d..a6f6f19052 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliImportanceComparatorDesc.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliImportanceComparatorDesc.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliRankComparatorAsc.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliRankComparatorAsc.java index af92e5c05d..4e7d810932 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliRankComparatorAsc.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliRankComparatorAsc.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliUpdateDateComparatorAsc.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliUpdateDateComparatorAsc.java index b37c75e5ac..7e406cdc33 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliUpdateDateComparatorAsc.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/PubliUpdateDateComparatorAsc.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/StatisticActivityVO.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/StatisticActivityVO.java index 45a07ab213..749d373bda 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/StatisticActivityVO.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/StatisticActivityVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/StatsFilterVO.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/StatsFilterVO.java index 7665aacd7b..b55320d2b4 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/StatsFilterVO.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/StatsFilterVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicComparator.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicComparator.java index 47efefa191..6907aa3366 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicComparator.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicDetail.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicDetail.java index 050511bfbb..ad74601ac4 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicDetail.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicSearch.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicSearch.java index 9df4c0c3ac..3c2bc6980a 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicSearch.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicSearch.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicSearchStatsVO.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicSearchStatsVO.java index f2a1ffac54..93aa57b721 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicSearchStatsVO.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/TopicSearchStatsVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/Treeview.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/Treeview.java index f1cb35914d..7b70a05cd4 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/Treeview.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/model/Treeview.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.model; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaActionPublicationUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaActionPublicationUserNotification.java index 6324e66440..dbdba47637 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaActionPublicationUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaActionPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaFolderUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaFolderUserNotification.java index bf1140a587..284b4275f5 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaFolderUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaFolderUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaPublicationUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaPublicationUserNotification.java index 76f0a1b17f..4dcb508390 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaPublicationUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaUserNotification.java index 4f5e156c87..3560f6c3c6 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/AbstractKmeliaUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmaxInstanceManualUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmaxInstanceManualUserNotification.java index c7a7e33607..82ddc5e374 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmaxInstanceManualUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmaxInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDefermentPublicationUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDefermentPublicationUserNotification.java index 45c05dc942..7d7ef7a6c6 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDefermentPublicationUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDefermentPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDelayedVisibilityUserNotificationReminder.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDelayedVisibilityUserNotificationReminder.java index 1c29a7a9a8..bc3c09dbda 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDelayedVisibilityUserNotificationReminder.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDelayedVisibilityUserNotificationReminder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDelayedVisibilityUserNotificationReminderInitializer.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDelayedVisibilityUserNotificationReminderInitializer.java index 4dba4f7c13..a236f72683 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDelayedVisibilityUserNotificationReminderInitializer.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaDelayedVisibilityUserNotificationReminderInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaInstanceManualUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaInstanceManualUserNotification.java index 3e96af69e7..5b2b01b70b 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaInstanceManualUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaModificationPublicationUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaModificationPublicationUserNotification.java index 9c2bca1cd7..caefef0f5d 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaModificationPublicationUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaModificationPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNoMoreValidatorPublicationUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNoMoreValidatorPublicationUserNotification.java index e1213a2d92..71018ede94 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNoMoreValidatorPublicationUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNoMoreValidatorPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyPublicationDocumentUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyPublicationDocumentUserNotification.java index 6f7370d63b..055c392df3 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyPublicationDocumentUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyPublicationDocumentUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; @@ -124,7 +124,7 @@ protected void performNotificationResource(final String language, final Publicat @Override protected String getResourceURL(final PublicationDetail resource) { - return KmeliaHelper.getDocumentUrl(resource, document, getNodePK()); + return KmeliaHelper.getDocumentUrl(resource, document, getComponentInstanceId()); } @Override diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyPublicationUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyPublicationUserNotification.java index 09244d1a19..561366c6a3 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyPublicationUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyTopicUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyTopicUserNotification.java index 9bb857aae4..870f634e6a 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyTopicUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaNotifyTopicUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaPendingValidationPublicationUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaPendingValidationPublicationUserNotification.java index 3e2da209ac..413a052685 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaPendingValidationPublicationUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaPendingValidationPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaSubscriptionPublicationUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaSubscriptionPublicationUserNotification.java index 8eceea5539..d8b661fd07 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaSubscriptionPublicationUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaSubscriptionPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaSupervisorPublicationUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaSupervisorPublicationUserNotification.java index ee82f362ec..64dfd1da7c 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaSupervisorPublicationUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaSupervisorPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaTopicUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaTopicUserNotification.java index c6afc45096..ea236de160 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaTopicUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaTopicUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaValidationPublicationUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaValidationPublicationUserNotification.java index 6e475f9d7d..64ab187a23 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaValidationPublicationUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/KmeliaValidationPublicationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/ToolboxInstanceManualUserNotification.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/ToolboxInstanceManualUserNotification.java index bfc71958a3..cdeaf50cb0 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/ToolboxInstanceManualUserNotification.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/notification/ToolboxInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/repository/TopicSearchJpaRepository.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/repository/TopicSearchJpaRepository.java index 4853586e4a..85d65b543b 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/repository/TopicSearchJpaRepository.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/repository/TopicSearchJpaRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.repository; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/repository/TopicSearchRepository.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/repository/TopicSearchRepository.java index bdd40908b7..6a20fc113c 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/repository/TopicSearchRepository.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/repository/TopicSearchRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.repository; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/KmeliaSearchServiceProvider.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/KmeliaSearchServiceProvider.java index 55b869fcca..3baf7cef85 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/KmeliaSearchServiceProvider.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/KmeliaSearchServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.search; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/TopicSearchService.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/TopicSearchService.java index f64affb207..3082488988 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/TopicSearchService.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/TopicSearchService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.search; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/TopicSearchServiceImpl.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/TopicSearchServiceImpl.java index 30846284cc..5b61f8086e 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/TopicSearchServiceImpl.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/search/TopicSearchServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.search; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/KmaxInstancePublicationAccessControlExtension.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/KmaxInstancePublicationAccessControlExtension.java index 7eab14b4a6..623a682ba4 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/KmaxInstancePublicationAccessControlExtension.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/KmaxInstancePublicationAccessControlExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.security.authorization; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/KmeliaInstancePublicationAccessControlExtension.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/KmeliaInstancePublicationAccessControlExtension.java index 0dc71add86..2f17a29ed9 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/KmeliaInstancePublicationAccessControlExtension.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/KmeliaInstancePublicationAccessControlExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.security.authorization; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/ToolboxInstancePublicationAccessControlExtension.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/ToolboxInstancePublicationAccessControlExtension.java index 5da7f826ed..7150b561e2 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/ToolboxInstancePublicationAccessControlExtension.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/security/authorization/ToolboxInstancePublicationAccessControlExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.security.authorization; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/AbstractKmeliaSimulationElementLister.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/AbstractKmeliaSimulationElementLister.java index aa0bd30ef0..580eaade7d 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/AbstractKmeliaSimulationElementLister.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/AbstractKmeliaSimulationElementLister.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/AutomaticDraftOut.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/AutomaticDraftOut.java index d89e74850c..7db2b381e8 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/AutomaticDraftOut.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/AutomaticDraftOut.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/DefaultKmeliaService.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/DefaultKmeliaService.java index fca9f37f0a..ae3912d64a 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/DefaultKmeliaService.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/DefaultKmeliaService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; @@ -1564,7 +1564,7 @@ public void addPublicationToTopicWithoutNotifications(PublicationPK pubPK, NodeP } private boolean isPublicationInBasket(PublicationPK pubPK) { - return publicationService.getMainLocation(pubPK).filter(NodePK::isTrash).isPresent(); + return publicationService.getAllLocations(pubPK).stream().anyMatch(NodePK::isTrash); } @SuppressWarnings("unchecked") @@ -4016,15 +4016,22 @@ public NodeDetail moveNode(@SourcePK NodePK nodePK, @TargetPK NodePK to, KmeliaPasteDetail pasteContext) { List<NodeDetail> treeToPaste = nodeService.getSubTree(nodePK); + boolean rightsOnTopicsEnabled = isRightsOnTopicsEnabled(to.getInstanceId()); + // move node and subtree - nodeService.moveNode(nodePK, to); + nodeService.moveNode(nodePK, to, rightsOnTopicsEnabled); for (NodeDetail fromNode : treeToPaste) { if (fromNode != null) { NodePK toNodePK = new NodePK(fromNode.getNodePK().getId(), to); - checkNodeRights(fromNode); - // move rich description of node - if (!nodePK.getInstanceId().equals(to.getInstanceId())) { + boolean movedToAnotherApp = !nodePK.getInstanceId().equals(to.getInstanceId()); + + if (movedToAnotherApp) { + NodeDetail toNode = nodeService.getDetail(toNodePK); + + checkNodeRights(fromNode, toNode, rightsOnTopicsEnabled); + + // move rich description of node WysiwygController.move(fromNode.getNodePK().getInstanceId(), NODE_PREFIX + fromNode.getId(), to.getInstanceId(), NODE_PREFIX + toNodePK.getId()); } @@ -4038,17 +4045,29 @@ public NodeDetail moveNode(@SourcePK NodePK nodePK, @TargetPK NodePK to, return getNodeHeader(nodePK); } - private void checkNodeRights(final NodeDetail node) { - if (node.haveLocalRights()) { + private void checkNodeRights(final NodeDetail fromNode, final NodeDetail node, + final boolean rightsOnTopicsEnabled) { + if (fromNode.haveLocalRights()) { List<ProfileInst> profiles = - adminController.getProfilesByObject(ProfiledObjectId.fromNode(node.getNodePK().getId()), - node.getNodePK().getInstanceId()); - for (ProfileInst profile : profiles) { - if (profile != null && StringUtil.isDefined(profile.getId())) { - - checkNodeProfile(profile, node.getNodePK().getInstanceId()); - - adminController.updateProfileInst(profile); + adminController.getProfilesByObject(ProfiledObjectId.fromNode(fromNode.getNodePK().getId()), + fromNode.getNodePK().getInstanceId()); + if (rightsOnTopicsEnabled) { + // adjusting previous rights according to target component + for (ProfileInst profile : profiles) { + if (profile != null && StringUtil.isDefined(profile.getId())) { + + // removing previous rights (can't be reused cause componentId have changed) + adminController.deleteProfileInst(profile.getId()); + + // checking rights and add new profile + checkNodeProfile(profile, node); + adminController.addProfileInst(profile); + } + } + } else { + // target component does not use specific rights, so removing rights + for (ProfileInst profile: profiles) { + adminController.deleteProfileInst(profile.getId()); } } } @@ -4076,36 +4095,32 @@ private NodeDetail copyNode(KmeliaCopyDetail copyDetail, HashMap<Integer, Intege String userId = copyDetail.getUserId(); NodeDetail nodeToCopy = nodeService.getDetail(nodePKToCopy); NodeDetail father = getNodeHeader(targetPK); + boolean rightsOnTopicsEnabled = isRightsOnTopicsEnabled(targetPK.getInstanceId()); // paste topic NodePK nodePK = new NodePK(UNKNOWN, targetPK); NodeDetail node = new NodeDetail(nodeToCopy); node.setNodePK(nodePK); node.setCreatorId(userId); - node.setRightsDependsOn(father.getRightsDependsOn()); + node.setRightsDependsOn(-1); node.setCreationDate(DateUtil.today2SQLDate()); nodePK = nodeService.createNode(node, father); // duplicate rights - if (copyDetail.isNodeRightsMustBeCopied()) { + if (rightsOnTopicsEnabled && copyDetail.isNodeRightsMustBeCopied()) { oldAndNewIds.put(Integer.parseInt(nodePKToCopy.getId()), Integer.parseInt(nodePK.getId())); - setNodeRightDependency(oldAndNewIds, nodeToCopy, nodePK, node); + setNodeRightDependency(nodeToCopy, father, node); // Set topic rights if necessary if (nodeToCopy.haveLocalRights()) { + node = nodeService.getDetail(nodePK); List<ProfileInst> topicProfiles = adminController.getProfilesByObject( ProfiledObjectId.fromNode(nodeToCopy.getNodePK().getId()), nodeToCopy.getNodePK().getInstanceId()); for (ProfileInst nodeToPasteProfile : topicProfiles) { if (nodeToPasteProfile != null) { ProfileInst nodeProfileInst = nodeToPasteProfile.copy(); - nodeProfileInst.setId("-1"); - nodeProfileInst.setComponentFatherId(getComponentLocalId(nodePK.getInstanceId())); - nodeProfileInst.setObjectId( - new ProfiledObjectId(ProfiledObjectType.NODE, nodePK.getId())); - nodeProfileInst.setParentObjectId( - new ProfiledObjectId(ProfiledObjectType.NODE, father.getNodePK().getId())); - checkNodeProfile(nodeProfileInst, nodePK.getInstanceId()); + checkNodeProfile(nodeProfileInst, node); // Add the profile adminController.addProfileInst(nodeProfileInst, userId); @@ -4146,9 +4161,10 @@ private NodeDetail copyNode(KmeliaCopyDetail copyDetail, HashMap<Integer, Intege * Removes all groups and users which are not authorized to access to component instance. * */ - private void checkNodeProfile(ProfileInst profile, String instanceId) { + private void checkNodeProfile(ProfileInst profile, NodeDetail node) { List<String> verifiedUserIds = new ArrayList<>(); List<String> verifiedGroupIds = new ArrayList<>(); + String instanceId = node.getNodePK().getInstanceId(); // check users and groups according to component instance rights List<String> userIdsToCheck = profile.getAllUsers(); @@ -4165,19 +4181,21 @@ private void checkNodeProfile(ProfileInst profile, String instanceId) { } } + profile.setId("-1"); profile.setUsers(verifiedUserIds); profile.setGroups(verifiedGroupIds); + profile.setComponentFatherId(getComponentLocalId(instanceId)); + profile.setObjectId(ProfiledObjectId.fromNode(node.getId())); + profile.setParentObjectId(ProfiledObjectId.fromNode(node.getFatherPK().getId())); } - private void setNodeRightDependency(final HashMap<Integer, Integer> oldAndNewIds, - final NodeDetail nodeToCopy, final NodePK nodePK, final NodeDetail node) { + private void setNodeRightDependency(final NodeDetail nodeToCopy, final NodeDetail father, + final NodeDetail node) { if (nodeToCopy.haveRights()) { if (nodeToCopy.haveLocalRights()) { - node.setRightsDependsOn(Integer.parseInt(nodePK.getId())); + node.setRightsDependsOnMe(); } else { - int oldRightsDependsOn = nodeToCopy.getRightsDependsOn(); - Integer newRightsDependsOn = oldAndNewIds.get(Integer.valueOf(oldRightsDependsOn)); - node.setRightsDependsOn(newRightsDependsOn); + node.setRightsDependsOn(father.getRightsDependsOn()); } nodeService.updateRightsDependency(node); } @@ -4699,4 +4717,4 @@ private void sendNoMoreValidatorNotification(final NodePK fatherPK, } } } -} \ No newline at end of file +} diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaAttachmentEventListener.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaAttachmentEventListener.java index 951dbf7c6d..6e16301e66 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaAttachmentEventListener.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaAttachmentEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ package org.silverpeas.components.kmelia.service; @@ -43,7 +43,7 @@ public class KmeliaAttachmentEventListener extends CDIResourceEventListener<Atta private DefaultKmeliaService kmeliaService; @Override - public void onDeletion(final AttachmentEvent event) throws Exception { + public void onDeletion(final AttachmentEvent event) { AttachmentRef attachment = event.getTransition().getBefore(); if (attachment != null && isAboutKmeliaPublication(attachment)) { kmeliaService.onDocumentDeletion(attachment); @@ -51,12 +51,12 @@ public void onDeletion(final AttachmentEvent event) throws Exception { } @Override - public void onUpdate(final AttachmentEvent event) throws Exception { + public void onUpdate(final AttachmentEvent event) { onCreation(event); } @Override - public void onCreation(final AttachmentEvent event) throws Exception { + public void onCreation(final AttachmentEvent event) { AttachmentRef attachment = event.getTransition().getAfter(); if (attachment != null) { anExternalPublicationElementHaveChanged(attachment, attachment.getUserId()); diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaHelper.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaHelper.java index 434f0c9307..e1f58bcd1d 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaHelper.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ @@ -123,9 +123,9 @@ public static String getNodeUrl(NodeDetail nodeDetail) { .getNodePK().getInstanceId(), false); } - public static String getDocumentUrl(PublicationDetail pubDetail, SimpleDocument document, NodePK nodePK) { - return "/Rkmelia/" + nodePK.getInstanceId() - + "/searchResult?Type=Document&Id=" + pubDetail.getPK().getId() + "&DocumentId=" + document. + public static String getDocumentUrl(PublicationDetail pubDetail, SimpleDocument document, String instanceId) { + return "/Rkmelia/" + instanceId + + "/searchResult?Type=Document&Id=" + pubDetail.getId() + "&DocumentId=" + document. getId() + "&FileOpened=0"; } diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaInitialize.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaInitialize.java index 0391811b56..f7d015d19e 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaInitialize.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaInitialize.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaInstanceContributionManager.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaInstanceContributionManager.java index 257837bc22..d75f7bf813 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaInstanceContributionManager.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaInstanceContributionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaNodeSimulationElementLister.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaNodeSimulationElementLister.java index a540406197..14a79c1741 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaNodeSimulationElementLister.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaNodeSimulationElementLister.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaOperationContext.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaOperationContext.java index c91d93d6ca..528963f0b6 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaOperationContext.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaOperationContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaPublicationSimulationElementLister.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaPublicationSimulationElementLister.java index 11b490fbc3..eb1b6f7700 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaPublicationSimulationElementLister.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaPublicationSimulationElementLister.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaService.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaService.java index c5b4887241..7373513e37 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaService.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaServiceContext.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaServiceContext.java index 932f403781..fab9cfbaab 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaServiceContext.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaServiceContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaUserEventListener.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaUserEventListener.java index 9d6e8113a6..a2f6623cc7 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaUserEventListener.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaUserEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaUserTreeViewFilter.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaUserTreeViewFilter.java index 448ec10926..c38f174d11 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaUserTreeViewFilter.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaUserTreeViewFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaValidation.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaValidation.java index 70feedacfa..26ea7967a8 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaValidation.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaValidation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaWysiwygEventListener.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaWysiwygEventListener.java index a945923f4d..5ba1c9c54f 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaWysiwygEventListener.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/KmeliaWysiwygEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/stats/StatisticService.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/stats/StatisticService.java index da91f57039..052593c574 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/stats/StatisticService.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/stats/StatisticService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.stats; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/stats/StatisticServiceImpl.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/stats/StatisticServiceImpl.java index 3ec3d4a874..8a130c3ab7 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/stats/StatisticServiceImpl.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/stats/StatisticServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.stats; diff --git a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/workflowextensions/SendInKmelia.java b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/workflowextensions/SendInKmelia.java index 5e1b18e467..a43a7b70e2 100644 --- a/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/workflowextensions/SendInKmelia.java +++ b/kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/workflowextensions/SendInKmelia.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,16 +19,19 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.workflowextensions; -import com.lowagie.text.Element; -import com.lowagie.text.Font; -import com.lowagie.text.Phrase; -import com.lowagie.text.pdf.PdfPCell; -import com.lowagie.text.pdf.PdfPTable; -import com.lowagie.text.pdf.PdfWriter; +import com.itextpdf.text.BaseColor; +import com.itextpdf.text.Document; +import com.itextpdf.text.Element; +import com.itextpdf.text.Font; +import com.itextpdf.text.Font.FontFamily; +import com.itextpdf.text.Phrase; +import com.itextpdf.text.pdf.PdfPCell; +import com.itextpdf.text.pdf.PdfPTable; +import com.itextpdf.text.pdf.PdfWriter; import net.htmlparser.jericho.Source; import org.silverpeas.components.kmelia.service.KmeliaService; import org.silverpeas.core.ResourceReference; @@ -70,7 +73,6 @@ import javax.inject.Inject; import javax.inject.Named; -import java.awt.*; import java.io.ByteArrayOutputStream; import java.io.FileInputStream; import java.io.PrintWriter; @@ -288,7 +290,7 @@ private SimpleDocumentPK copyFile(SimpleDocument file, ResourceReference toPK, D } private byte[] generatePDF(final String role, ProcessInstance instance) { - com.lowagie.text.Document document = new com.lowagie.text.Document(); + Document document = new Document(); try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -309,7 +311,7 @@ private byte[] generatePDF(final String role, ProcessInstance instance) { return new byte[0]; } - private void generatePDFStep(final String role, HistoryStep step, com.lowagie.text.Document document) { + private void generatePDFStep(final String role, HistoryStep step, Document document) { if (step != null) { generatePDFStepHeader(role, step, document); generatePDFStepContent(role, step, document); @@ -317,7 +319,7 @@ private void generatePDFStep(final String role, HistoryStep step, com.lowagie.te } private void generatePDFStepHeader(final String role, HistoryStep step, - com.lowagie.text.Document document) { + Document document) { try { String activity = ""; if (step.getResolvedState() != null) { @@ -342,11 +344,11 @@ private void generatePDFStepHeader(final String role, HistoryStep step, } header += sAction + " (" + actor + " - " + date + ")"; - Font fontHeader = new Font(Font.HELVETICA, 12, Font.NORMAL); + Font fontHeader = new Font(FontFamily.HELVETICA, 12, Font.NORMAL); PdfPCell pCell = new PdfPCell(new Phrase(header, fontHeader)); pCell.setFixedHeight(28); - pCell.setBackgroundColor(new Color(239, 239, 239)); + pCell.setBackgroundColor(new BaseColor(239, 239, 239)); pCell.setVerticalAlignment(Element.ALIGN_MIDDLE); PdfPTable pTable = new PdfPTable(1); @@ -379,7 +381,7 @@ private String getAction(final String role, final HistoryStep step) { } private void generatePDFStepContent(final String role, HistoryStep step, - com.lowagie.text.Document document) { + Document document) { try { Form form; if ("#question#".equals(step.getAction()) || "#response#".equals(step.getAction())) { @@ -413,8 +415,8 @@ private void generatePdfFieldContent(final HistoryStep step, final DataRecord da final PagesContext pageContext, final PdfPTable tableContent, final GenericFieldTemplate fieldTemplate) { try { - Font fontLabel = new Font(Font.HELVETICA, 10, Font.BOLD); - Font fontValue = new Font(Font.HELVETICA, 10, Font.NORMAL); + Font fontLabel = new Font(FontFamily.HELVETICA, 10, Font.BOLD); + Font fontValue = new Font(FontFamily.HELVETICA, 10, Font.NORMAL); String fieldLabel = fieldTemplate.getLabel(getLanguage()); String fieldValue = null; Field field = data.getField(fieldTemplate.getFieldName()); diff --git a/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaServiceContextTest.java b/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaServiceContextTest.java index c3b3be5b1d..9862b2cb03 100644 --- a/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaServiceContextTest.java +++ b/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaServiceContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaUserTreeViewFilterTest.java b/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaUserTreeViewFilterTest.java index 2116bbf0ce..4b51607ce5 100644 --- a/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaUserTreeViewFilterTest.java +++ b/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaUserTreeViewFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaValidationTest.java b/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaValidationTest.java index f1f6b72b08..1582763405 100644 --- a/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaValidationTest.java +++ b/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/service/KmeliaValidationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.service; diff --git a/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/stats/StatisticServiceTest.java b/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/stats/StatisticServiceTest.java index 40b220f0f4..ee4e6b0988 100644 --- a/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/stats/StatisticServiceTest.java +++ b/kmelia/kmelia-library/src/test/java/org/silverpeas/components/kmelia/stats/StatisticServiceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.stats; diff --git a/kmelia/kmelia-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer b/kmelia/kmelia-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer index 9785bab5e6..02b5b225ce 100644 --- a/kmelia/kmelia-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer +++ b/kmelia/kmelia-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # org.silverpeas.core.test.TestBeanContainer \ No newline at end of file diff --git a/kmelia/kmelia-war/pom.xml b/kmelia/kmelia-war/pom.xml index 026beef895..a43bbb4a4d 100644 --- a/kmelia/kmelia-war/pom.xml +++ b/kmelia/kmelia-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>kmelia</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.kmelia</groupId> @@ -58,8 +58,8 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> + <groupId>com.itextpdf</groupId> + <artifactId>itextpdf</artifactId> </dependency> <dependency> <groupId>org.silverpeas.core.services</groupId> diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmax/KmaxIndexer.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmax/KmaxIndexer.java index 621b9bcfc0..eec80f1c73 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmax/KmaxIndexer.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmax/KmaxIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmax; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/FileImport.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/FileImport.java index de5ff1805e..5fb0f60887 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/FileImport.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/FileImport.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaConstants.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaConstants.java index 9df6d4bdcf..5555c4c300 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaConstants.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaConstants.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaIndexer.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaIndexer.java index d17d4d6709..3ff3e518bb 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaIndexer.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaTransversal.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaTransversal.java index ae0b27b648..1d18e1a7c0 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaTransversal.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/KmeliaTransversal.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/RssLastPublicationsServlet.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/RssLastPublicationsServlet.java index 3810350fbb..4847f0629b 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/RssLastPublicationsServlet.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/RssLastPublicationsServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/SearchContext.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/SearchContext.java index c486651492..0828827111 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/SearchContext.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/SearchContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/Sort.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/Sort.java index 77e0ed4364..faa27008df 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/Sort.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/Sort.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,11 +19,13 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; -public class Sort { +import java.io.Serializable; + +public class Sort implements Serializable { public static final int SORT_CREATOR_ASC = 0; public static final int SORT_UPDATE_ASC = 1; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/ToolboxIndexer.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/ToolboxIndexer.java index c61c637b5c..988f96812a 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/ToolboxIndexer.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/ToolboxIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/control/KmeliaSessionController.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/control/KmeliaSessionController.java index 59c99d7161..fb6cb5f4b2 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/control/KmeliaSessionController.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/control/KmeliaSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.control; @@ -183,7 +183,7 @@ public class KmeliaSessionController extends AbstractComponentSessionController private List<String> sessionCombination = null; // Specific Kmax private String sessionTimeCriteria = null; - private Sort sortValue = new Sort(); + private Sort sortValue; private int rang = 0; public static final String TAB_PREVIEW = "tabpreview"; public static final String TAB_HEADER = "tabheader"; @@ -245,6 +245,9 @@ public static List<String> getLanguagesOfAttachments(ResourceReference resourceR } private void init() { + sortValue = new Sort(); + sortValue.setCurrentSort(getDefaultSortValue()); + // Remove all data store by this SessionController removeSessionObjects(); currentLanguage = getLanguage(); @@ -1443,6 +1446,8 @@ public void setSessionTopic(TopicDetail topicDetail) { setCurrentFolderId(topicDetail.getNodePK().getId(), true); Collection<KmeliaPublication> publications = topicDetail.getKmeliaPublications(); setSessionPublicationsList((List<KmeliaPublication>) publications); + } else { + setCurrentFolderId(NodePK.ROOT_NODE_ID, true); } } @@ -2516,92 +2521,10 @@ public List<String> getAttachmentLanguages() { return languages; } - public Collection<Location> getPublicationAliases() { - return getKmeliaService().getAliases(getSessionPublication().getDetail().getPK()); - } - - public void setPublicationAliases(List<Location> locations) { - getKmeliaService().setAliases(getSessionPublication().getDetail().getPK(), locations); - } - public Collection<Location> getPublicationLocations() { return getKmeliaService().getLocations(getSessionPublication().getDetail().getPK()); } - /** - * @return a List of Treeview - */ - public List<Treeview> getComponents(Collection<Location> locations) { - List<Treeview> result = new ArrayList<>(); - List<NodeDetail> tree = null; - NodePK root = new NodePK(NodePK.ROOT_NODE_ID); - - // adding personal component if current space is personal - SpaceInstLight currentSpace = - getOrganisationController().getSpaceInstLightById(getSpaceId()); - if (currentSpace != null && currentSpace.isPersonalSpace()) { - tree = initTreeView(locations, result, tree, root, currentSpace, new StringBuilder(), - getComponentId()); - } - - List<SpaceInstLight> spaces = getOrganisationController().getSpaceTreeview(getUserId()); - for (SpaceInstLight space : spaces) { - StringBuilder path = new StringBuilder(); - String[] componentIds = - getOrganisationController().getAvailCompoIdsAtRoot(space.getId(), getUserId()); - for (String componentId : componentIds) { - String instanceId = componentId; - - if (instanceId.startsWith(KMELIA) && - (getKmeliaService().isUserCanPublish(instanceId, getUserId()) || - instanceId.equals(getComponentId()))) { - tree = initTreeView(locations, result, tree, root, space, path, instanceId); - } - } - } - return result; - } - - private List<NodeDetail> initTreeView(final Collection<Location> locations, final List<Treeview> result, - List<NodeDetail> tree, final NodePK root, final SpaceInstLight space, - final StringBuilder path, final String instanceId) { - root.setComponentName(instanceId); - - if (instanceId.equals(getComponentId())) { - tree = getKmeliaService().getTreeview(root, null, false, false, getUserId(), false, - isRightsOnTopicsEnabled()); - } - - if (path.length() == 0) { - List<SpaceInstLight> sPath = getOrganisationController().getPathToSpace(space.getId()); - boolean first = true; - for (SpaceInstLight spaceInPath : sPath) { - if (!first) { - path.append(" > "); - } - path.append(spaceInPath.getName()); - first = false; - } - } - - Treeview treeview = new Treeview(path.toString() + " > " + - getOrganisationController().getComponentInstLight(instanceId).getLabel(), tree, - instanceId); - - treeview.setNbAliases(getNbAliasesInComponent(locations, instanceId)); - - if (instanceId.equals(getComponentId())) { - result.add(0, treeview); - } else { - result.add(treeview); - } - return tree; - } - - public List<NodeDetail> getAliasTreeview() { - return getAliasTreeview(getComponentId()); - } - public List<NodeDetail> getAliasTreeview(String instanceId) { List<NodeDetail> tree = null; if (getKmeliaService().isUserCanPublish(instanceId, getUserId())) { @@ -2612,16 +2535,6 @@ public List<NodeDetail> getAliasTreeview(String instanceId) { return tree; } - private int getNbAliasesInComponent(Collection<Location> locations, String instanceId) { - int nb = 0; - for (Location location : locations) { - if (location.getInstanceId().equals(instanceId)) { - nb++; - } - } - return nb; - } - private boolean isToolbox() { return KmeliaHelper.isToolbox(getComponentId()); } @@ -2874,6 +2787,7 @@ public synchronized List<KmeliaPublication> search(String query) { queryDescription.setSearchingUser(getUserId()); queryDescription.setRequestedFolder(getCurrentFolder().getFullPath()); queryDescription.addComponent(getComponentId()); + queryDescription.setRequestedLanguage("*"); try { List<MatchingIndexEntry> results = getSearchEngine().search(queryDescription).getEntries(); @@ -3538,4 +3452,4 @@ private String getPublicationListSessionCacheKey() { return KmeliaSessionController.class.getSimpleName() + "#" + getComponentId() + "#publicationList"; } -} \ No newline at end of file +} diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DefaultExportFileNameProducer.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DefaultExportFileNameProducer.java index bd2485d89f..443fcf814d 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DefaultExportFileNameProducer.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DefaultExportFileNameProducer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,14 +11,14 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentBuildException.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentBuildException.java index 8fe9330fec..f351fa8920 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentBuildException.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentBuildException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,14 +11,14 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentMergeException.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentMergeException.java index ecda9e64c7..35bc67cec4 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentMergeException.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentMergeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentTemplateParts.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentTemplateParts.java index d0cfb1e590..68a4794f06 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentTemplateParts.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/DocumentTemplateParts.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,14 +11,14 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ExportFileNameProducer.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ExportFileNameProducer.java index 5cc632ad52..aca202c06c 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ExportFileNameProducer.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ExportFileNameProducer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,14 +11,14 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/KmeliaPublicationExporter.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/KmeliaPublicationExporter.java index 5209a476d8..739dc58341 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/KmeliaPublicationExporter.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/KmeliaPublicationExporter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,14 +11,14 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentBuilder.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentBuilder.java index 3aabd6bf71..0d5e0dc379 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentBuilder.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentTextTranslator.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentTextTranslator.java index 36d95bf060..d1b7382260 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentTextTranslator.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentTextTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentsMerging.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentsMerging.java index 16f48c87ca..9afb1b0074 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentsMerging.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/ODTDocumentsMerging.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/SilverpeasImageFinder.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/SilverpeasImageFinder.java index 85fd32c1b4..718c26d323 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/SilverpeasImageFinder.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/SilverpeasImageFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/SimpleDocumentHolder.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/SimpleDocumentHolder.java index 39f54cca58..d772893e4d 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/SimpleDocumentHolder.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/export/SimpleDocumentHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,14 +11,14 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.export; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/importexport/KmeliaImportExport.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/importexport/KmeliaImportExport.java index 21037fa597..4f039ae51c 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/importexport/KmeliaImportExport.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/importexport/KmeliaImportExport.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,17 +9,18 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.importexport; +import org.silverpeas.components.kmelia.InstanceParameters; import org.silverpeas.components.kmelia.KmeliaException; import org.silverpeas.components.kmelia.service.KmeliaHelper; import org.silverpeas.components.kmelia.service.KmeliaService; @@ -103,8 +104,8 @@ protected String createPublicationIntoTopic(PublicationDetail pubDetTemp, NodePK .getOrganisationController(); if (pubDetTemp.isStatusMustBeChecked()) { final String profile; - if ("yes".equalsIgnoreCase(orgnaisationController.getComponentParameterValue(topicPK - .getInstanceId(), "rightsOnTopics"))) { + if (StringUtil.getBooleanValue(orgnaisationController.getComponentParameterValue(topicPK + .getInstanceId(), InstanceParameters.rightsOnFolders))) { NodeDetail topic = getNodeService().getHeader(topicPK); if (topic.haveRights()) { profile = KmeliaHelper.getProfile(orgnaisationController.getUserProfiles(userDetail.getId(), @@ -161,6 +162,8 @@ protected NodePK addSubTopicToTopic(NodeDetail nodeDetail, int topicId, UnitRepo } // S'il n'existe pas encore, on le crée et on le configure final NodePK parentTopicPk = new NodePK(Integer.toString(topicId), getCurrentComponentId()); + final NodeDetail father = getNodeService().getDetail(parentTopicPk); + nodeDetail.setRightsDependsOn(father.getRightsDependsOn()); final NodePK newTopicPk = getKmeliaService().addSubTopic(parentTopicPk, nodeDetail, "None"); if (Integer.parseInt(newTopicPk.getId()) < 0) { unitReport.setError(UnitReport.ERROR_ERROR); @@ -215,6 +218,8 @@ protected NodePK addSubTopicToTopic(NodeDetail nodeDetail, int topicId, final NodePK topicPK = new NodePK(Integer.toString(topicId), getCurrentComponentId()); nodeDetail.getNodePK().setComponentName(getCurrentComponentId()); nodeDetail.setCreatorId(getCurrentUserDetail().getId()); + final NodeDetail father = getNodeService().getDetail(topicPK); + nodeDetail.setRightsDependsOn(father.getRightsDependsOn()); nodePK = getKmeliaService().addSubTopic(topicPK, nodeDetail, "None"); massiveReport.addOneTopicCreated(); } catch (Exception ex) { diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/jstl/KmeliaDisplayHelper.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/jstl/KmeliaDisplayHelper.java index 8f1c7b12f3..c1b0215ad9 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/jstl/KmeliaDisplayHelper.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/jstl/KmeliaDisplayHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.jstl; @@ -162,7 +162,7 @@ public static void displayAllOperations(String id, KmeliaSessionController kmeli } if (invisibleTabs.indexOf(KmeliaSessionController.TAB_ACCESS_PATHS) == -1 && !kmaxMode && !pubDetail.isAlias()) { - tabbedPane.addTab(resources.getString("PubGererChemins"), routerUrl + tabbedPane.addTab(resources.getString("PubGererChemins")+ " ("+kmeliaScc.getPublicationLocations().size()+")", routerUrl + "PublicationPaths?PubId=" + pubId, "ViewPath".equals(action), enabled); } diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/notification/VersionSupportUpdater.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/notification/VersionSupportUpdater.java index 2ca50abe39..b2a663579c 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/notification/VersionSupportUpdater.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/notification/VersionSupportUpdater.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.notification; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/portlets/LastPublicationsPortlet.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/portlets/LastPublicationsPortlet.java index 85911b29a9..b3920f0dc1 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/portlets/LastPublicationsPortlet.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/portlets/LastPublicationsPortlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.portlets; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/AjaxPublicationsListServlet.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/AjaxPublicationsListServlet.java index e279018c00..b96fb50149 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/AjaxPublicationsListServlet.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/AjaxPublicationsListServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets; @@ -230,7 +230,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) writer.write("<div class=\"inlineMessage-nok\">"); writer.write(resources.getString("GML.ForbiddenAccessContent")); writer.write("</div>"); - } else if (NodePK.ROOT_NODE_ID.equals(kmeliaSC.getCurrentFolderId()) && kmeliaSC. + } else if (!toLink && NodePK.ROOT_NODE_ID.equals(kmeliaSC.getCurrentFolderId()) && kmeliaSC. getNbPublicationsOnRoot() != 0 && kmeliaSC.isTreeStructure() && !searchInProgress) { try { displayLastPublications(kmeliaSC, resources, writer); diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/AjaxServlet.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/AjaxServlet.java index 96b4a32d20..c63ae1e156 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/AjaxServlet.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/AjaxServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/JSONServlet.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/JSONServlet.java index c2fa013b4c..7b167ad812 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/JSONServlet.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/JSONServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/KmeliaActionAccessController.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/KmeliaActionAccessController.java index 1007d68745..69dc10d97f 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/KmeliaActionAccessController.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/KmeliaActionAccessController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/KmeliaRequestRouter.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/KmeliaRequestRouter.java index b852ca2194..4fcce35243 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/KmeliaRequestRouter.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/KmeliaRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets; @@ -44,7 +44,6 @@ import org.silverpeas.core.contribution.content.form.RecordSet; import org.silverpeas.core.contribution.content.wysiwyg.service.WysiwygController; import org.silverpeas.core.contribution.model.ContributionIdentifier; -import org.silverpeas.core.contribution.publication.model.CompletePublication; import org.silverpeas.core.contribution.publication.model.Location; import org.silverpeas.core.contribution.publication.model.PublicationDetail; import org.silverpeas.core.contribution.publication.model.PublicationLink; @@ -257,9 +256,9 @@ public String getDestination(String function, KmeliaSessionController kmelia, request.setAttribute("SearchScope", SearchContext.GLOBAL); } - if (type != null && ("Publication".equals(type) || - "org.silverpeas.core.personalorganizer.model.TodoDetail".equals(type) || - "Attachment".equals(type) || "Document".equals(type) || type.startsWith("Comment"))) { + if (type != null && + ("Publication".equals(type) || "TodoDetail".equals(type) || "Attachment".equals(type) || + "Document".equals(type) || type.startsWith("Comment"))) { try { PublicationDetail pub2Check = kmelia.getPublicationDetail(id); // If given PK defines a clone, change PK to master @@ -995,47 +994,13 @@ public String getDestination(String function, KmeliaSessionController kmelia, KmeliaPublication publication = kmelia.getSessionPublication(); request.setAttribute("Publication", publication); request.setAttribute("LinkedPathString", kmelia.getSessionPath()); - Collection<Location> locations = kmelia.getPublicationLocations(); - request.setAttribute("Locations", locations); - if (toolboxMode) { - request.setAttribute("Topics", kmelia.getAllTopics()); - } else { - request.setAttribute("Components", kmelia.getComponents(locations)); - } destination = rootDestination + "publicationPaths.jsp"; - } else if (function.equals("SetPath")) { - final String[] topics = request.getParameterValues("topicChoice"); - final List<String> loadedComponentIds = request.getParameterAsList("LoadedComponentIds"); - final List<Location> locations = new ArrayList<>(); - for (int i = 0; topics != null && i < topics.length; i++) { - String topicId = topics[i]; - StringTokenizer tokenizer = new StringTokenizer(topicId, ","); - String nodeId = tokenizer.nextToken(); - String instanceId = tokenizer.nextToken(); - - Location location = new Location(nodeId, instanceId); - location.setAsAlias(kmelia.getUserId()); - locations.add(location); - } - - // Tous les composants ayant un alias n'ont pas forcément été chargés - Collection<Location> oldLocations = kmelia.getPublicationAliases(); - for (Location oldLocation : oldLocations) { - if (!loadedComponentIds.contains(oldLocation.getInstanceId()) && oldLocation.isAlias()) { - // le composant de l'alias n'a pas été chargé - locations.add(oldLocation); - } - } - - kmelia.setPublicationAliases(locations); - - destination = getDestination("ViewPublication", kmelia, request); } else if (function.equals("ShowAliasTree")) { String componentId = request.getParameter("ComponentId"); request.setAttribute("Tree", kmelia.getAliasTreeview(componentId)); - request.setAttribute("Aliases", kmelia.getPublicationAliases()); + request.setAttribute("Locations", kmelia.getPublicationLocations()); destination = rootDestination + "treeview4PublicationPaths.jsp"; } else if ("ToAddLinksToPublication".equals(function)) { @@ -1106,15 +1071,14 @@ public String getDestination(String function, KmeliaSessionController kmelia, // Go to importExportPeas destination = "/RimportExportPeas/jsp/SelectExportMode"; } else if (function.equals("ToPubliContent")) { - CompletePublication completePublication = - kmelia.getSessionPubliOrClone().getCompleteDetail(); + PublicationDetail publicationDetail = kmelia.getSessionPubliOrClone().getDetail(); if (WysiwygController.haveGotWysiwyg(kmelia.getComponentId(), - completePublication.getPublicationDetail().getPK().getId(), + publicationDetail.getPK().getId(), kmelia.getCurrentLanguage())) { destination = getDestination("ToWysiwyg", kmelia, request); } else { - String infoId = completePublication.getPublicationDetail().getInfoId(); + String infoId = publicationDetail.getInfoId(); if (infoId == null || "0".equals(infoId)) { List<String> usedModels = kmelia.getModelUsed(); if (usedModels.size() == 1) { @@ -1985,4 +1949,4 @@ private AliasOnOtherKmeliaException(final String pubId, final NodePK aliasLocati this.aliasLocation = aliasLocation; } } -} \ No newline at end of file +} diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/PublicationFragmentSettings.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/PublicationFragmentSettings.java index f10e785977..dae70a8131 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/PublicationFragmentSettings.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/PublicationFragmentSettings.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/AjaxHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/AjaxHandler.java index d575fe3eda..acfad6d98d 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/AjaxHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/AjaxHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/AjaxOperation.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/AjaxOperation.java index b71377fbe1..b385c90791 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/AjaxOperation.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/AjaxOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/BindToPubliHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/BindToPubliHandler.java index 01e75a05d8..8784b17605 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/BindToPubliHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/BindToPubliHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/CopyPublicationsHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/CopyPublicationsHandler.java index 21aa98e42c..84bf387d56 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/CopyPublicationsHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/CopyPublicationsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/CutPublicationsHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/CutPublicationsHandler.java index 5dc71a5cb1..064149dc97 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/CutPublicationsHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/CutPublicationsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/DeleteHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/DeleteHandler.java index bcf34c226b..52fc4038e6 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/DeleteHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/DeleteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/DeletePublicationsHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/DeletePublicationsHandler.java index 9dc0fed2a9..13ea27f80c 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/DeletePublicationsHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/DeletePublicationsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/EmptyTrashHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/EmptyTrashHandler.java index 2733842cb4..093c783964 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/EmptyTrashHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/EmptyTrashHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetClipboardStateHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetClipboardStateHandler.java index 92ebbaae66..bf90c5ea9d 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetClipboardStateHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetClipboardStateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetProfileHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetProfileHandler.java index f4c3399b59..10dc48ab57 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetProfileHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetProfileHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetPublicationAuthorizationsHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetPublicationAuthorizationsHandler.java index dd9d02cd42..59bb9d996e 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetPublicationAuthorizationsHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetPublicationAuthorizationsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetTopicWysiwygHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetTopicWysiwygHandler.java index 8be4e9ae20..7db4bb4f59 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetTopicWysiwygHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/GetTopicWysiwygHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/MovePublicationHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/MovePublicationHandler.java index f13be6a0ee..95853b1d27 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/MovePublicationHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/MovePublicationHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/OperationOnPublicationsHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/OperationOnPublicationsHandler.java index b9e243d6c7..ec7a3c03da 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/OperationOnPublicationsHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/OperationOnPublicationsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/PasteHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/PasteHandler.java index 3cb44b9516..72eacde3aa 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/PasteHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/PasteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/RenameTopicHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/RenameTopicHandler.java index 8f50a08171..4ce8f3a462 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/RenameTopicHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/RenameTopicHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/SortTopicsHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/SortTopicsHandler.java index 3bac90b51d..15d4fecdbf 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/SortTopicsHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/SortTopicsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/UnbindToPubliHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/UnbindToPubliHandler.java index 89939453bf..bcb968cd9a 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/UnbindToPubliHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/UnbindToPubliHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/UpdateTopicStatusHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/UpdateTopicStatusHandler.java index 15e474a284..a619a519ff 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/UpdateTopicStatusHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/ajax/handlers/UpdateTopicStatusHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.ajax.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/handlers/StatisticRequestHandler.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/handlers/StatisticRequestHandler.java index f4acbe203f..307c990aa0 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/handlers/StatisticRequestHandler.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/servlets/handlers/StatisticRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.servlets.handlers; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/ui/ResultSearchRenderer.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/ui/ResultSearchRenderer.java index 1b4b72c45f..87d1c8efa1 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/ui/ResultSearchRenderer.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/ui/ResultSearchRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.ui; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/web/FolderResource.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/web/FolderResource.java index 7d0ed44776..2aad0c757b 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/web/FolderResource.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/web/FolderResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.web; diff --git a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/web/KmeliaResource.java b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/web/KmeliaResource.java index 5cbf33fdb8..b4fae3a6c3 100644 --- a/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/web/KmeliaResource.java +++ b/kmelia/kmelia-war/src/main/java/org/silverpeas/components/kmelia/web/KmeliaResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.kmelia.web; diff --git a/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/dragAndDrop.tag b/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/dragAndDrop.tag index bf2b5ac895..f64f0f567b 100644 --- a/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/dragAndDrop.tag +++ b/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/dragAndDrop.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/paste.tag b/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/paste.tag index c533f08939..8cf79b16bb 100644 --- a/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/paste.tag +++ b/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/paste.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/seeAlso.tag b/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/seeAlso.tag index c757dd87a4..9586c7ac5a 100644 --- a/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/seeAlso.tag +++ b/kmelia/kmelia-war/src/main/webapp/WEB-INF/tags/silverpeas/kmelia/seeAlso.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/kmelia/kmelia-war/src/main/webapp/WEB-INF/web.xml b/kmelia/kmelia-war/src/main/webapp/WEB-INF/web.xml index 58202dc559..a85ab5dd6e 100644 --- a/kmelia/kmelia-war/src/main/webapp/WEB-INF/web.xml +++ b/kmelia/kmelia-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <web-app> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/addTopic.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/addTopic.jsp index 72f2655f3b..522ae5a4dd 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/addTopic.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/addTopic.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.util.MultiSilverpeasBundle"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/attachmentLinkManagement.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/attachmentLinkManagement.jsp index 323e388517..77f831f9cc 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/attachmentLinkManagement.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/attachmentLinkManagement.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> @@ -121,6 +121,14 @@ function setCurrentNodeId(id){ currentNodeId = id; } +function showPublicationOperations() { + // not implemented but necessary to prevent javascript errors +} + +function hidePublicationOperations () { + // not implemented but necessary to prevent javascript errors +} + function doPagination(index, nbItemsPerPage){ var ieFix = new Date().getTime(); $.get('<%=contextName%>/RAjaxPublicationsListServlet', {Index:index,NbItemsPerPage:nbItemsPerPage,ComponentId:currentComponent,attachmentLink:1,IEFix:ieFix}, @@ -131,7 +139,7 @@ function doPagination(index, nbItemsPerPage){ function displayPublications(CompoId,topicId){ var ieFix = new Date().getTime(); - $.get('<%=contextName%>/RAjaxPublicationsListServlet', {ComponentId:CompoId,TopicToLinkId:topicId,attachmentLink:1,IEFix:ieFix}, + $.get('<%=contextName%>/RAjaxPublicationsListServlet', {ComponentId:CompoId,Id:topicId,attachmentLink:1,IEFix:ieFix}, function(data){ $('#pubList').html(data); },"html"); diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/attachmentManager.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/attachmentManager.jsp index 06d7b0f939..557eb4cdb8 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/attachmentManager.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/attachmentManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/basket.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/basket.jsp index db4f0f7293..4584cc8b00 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/basket.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/basket.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/checkKmelia.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/checkKmelia.jsp index c07c843f8d..60ddb73e55 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/checkKmelia.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/checkKmelia.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/clone.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/clone.jsp index 399064b247..df460281ee 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/clone.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/clone.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/closeWindow.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/closeWindow.jsp index bdb5a64d4c..3ac64294b8 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/closeWindow.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/closeWindow.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/defermentMotive.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/defermentMotive.jsp index bdcac30037..fb6ee8ff6c 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/defermentMotive.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/defermentMotive.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/importMultiFiles.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/importMultiFiles.jsp index 7ea20d45c2..86cfd30c0f 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/importMultiFiles.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/importMultiFiles.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/importOneFile.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/importOneFile.jsp index a403c6db6e..29e1f3f0fd 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/importOneFile.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/importOneFile.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax.jsp index d170a29f4d..65f30bcb3f 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addAxis.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addAxis.jsp index 15fcbcf8ef..28718ef13c 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addAxis.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addAxis.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addPositionToAxis.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addPositionToAxis.jsp index b5f3e4ae33..cb1a5967ba 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addPositionToAxis.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addPositionToAxis.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addPositionToPosition.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addPositionToPosition.jsp index a2f607a2ec..33076cae24 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addPositionToPosition.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_addPositionToPosition.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_axisManager.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_axisManager.jsp index 8a60ae5fb1..28e9f9a685 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_axisManager.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_axisManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_axisReport.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_axisReport.jsp index ed7738fedc..b341f6a1d7 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_axisReport.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_axisReport.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_portlet.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_portlet.jsp index 0b8cedb39d..b1ee7d1b59 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_portlet.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_viewCombination.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_viewCombination.jsp index 1ed5c924bc..fbceeaf1bc 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_viewCombination.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/kmax_viewCombination.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/modelUsedList.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/modelUsedList.jsp index 2fe1d4cb4b..6f4e4ebb49 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/modelUsedList.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/modelUsedList.jsp @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/modelsList.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/modelsList.jsp index ada082ef99..e3d83e6e03 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/modelsList.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/modelsList.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/oneLevel.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/oneLevel.jsp index 28ff000ca0..2cf66a194f 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/oneLevel.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/oneLevel.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/orderPublications.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/orderPublications.jsp index 33f027ff70..d089b47b81 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/orderPublications.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/orderPublications.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/orderTopics.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/orderTopics.jsp index 04992a4d6b..53639fcf41 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/orderTopics.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/orderTopics.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/portlet.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/portlet.jsp index c69a88c0b8..ac218b6187 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/portlet.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publication.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publication.jsp index 6bf9418587..04e115c8d9 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publication.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publication.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.kmelia.KmeliaPublicationHelper"%> @@ -599,7 +599,7 @@ <% } %> </p> - <% if (kmeliaScc.getInvisibleTabs().indexOf(kmeliaScc.TAB_COMMENT) == -1 && !kmaxMode) { %> + <% if (!kmeliaScc.getInvisibleTabs().contains(KmeliaSessionController.TAB_COMMENT)) { %> <p id="commentInfo"> <fmt:message key="GML.comment.number"/><br /> <a href="#commentaires">${kmeliaPubli.numberOfComments}</a> @@ -839,10 +839,8 @@ resourceId="<%=id%>" contentLanguage="<%=contentLanguage%>" highestUserRole="<%=SilverpeasRole.from(attProfile)%>"/> - <% - if (kmeliaScc.getInvisibleTabs().indexOf(kmeliaScc.TAB_COMMENT) == -1 && !kmaxMode) { - %> + <% if (!kmeliaScc.getInvisibleTabs().contains(KmeliaSessionController.TAB_COMMENT)) { %> <view:comments userId="<%= user_id%>" componentId="<%= componentId %>" resourceType="<%= resourceType %>" resourceId="<%= id %>" indexed="<%= indexIt %>"/> <% } %> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationLinksManager.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationLinksManager.jsp index df23cc1326..d45eaf59ff 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationLinksManager.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationLinksManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationManager.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationManager.jsp index 34f282b1be..9ebb8ef37e 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationManager.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationPaths.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationPaths.jsp index 3742125534..2deb9ef4a4 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationPaths.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationPaths.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,16 +20,14 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view"%> -<%@ page import="org.apache.ecs.xhtml.input" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ page import="org.silverpeas.components.kmelia.model.KmeliaPublication" %> -<%@page import="org.silverpeas.components.kmelia.model.Treeview"%> -<%@ page import="org.silverpeas.core.contribution.publication.model.Location" %> -<%@ page import="org.silverpeas.core.util.Mutable" %> <% response.setHeader("Cache-Control","no-store"); //HTTP 1.1 response.setHeader("Pragma","no-cache"); //HTTP 1.0 @@ -41,93 +39,187 @@ response.setDateHeader ("Expires",-1); //prevents caching at the proxy server <% KmeliaPublication publication = (KmeliaPublication) request.getAttribute("Publication"); String linkedPathString = (String) request.getAttribute("LinkedPathString"); -Collection<NodeDetail> topics = (Collection<NodeDetail>) request.getAttribute("Topics"); String currentLang = (String) request.getAttribute("Language"); -List<Treeview> components = (List<Treeview>) request.getAttribute("Components"); -Collection<Location> locations = (Collection<Location>) request.getAttribute("Locations"); String pubName = publication.getDetail().getName(currentLang); String id = publication.getDetail().getPK().getId(); -Button validateButton = gef.getFormButton(resources.getString("GML.validate"), "javascript:onClick=sendData();", false); -Button cancelButton = gef.getFormButton(resources.getString("GML.cancel"), "ViewPublication?PubId="+id, false); +boolean toolbox = componentId.startsWith("toolbox"); %> +<c:set var="toolbox" value="<%=toolbox%>"/> +<fmt:setLocale value="${sessionScope[sessionController].language}" /> +<view:setBundle bundle="${requestScope.resources.multilangBundle}" /> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xml:lang="<%=currentLang%>%>"> +<html xml:lang="<%=currentLang%>"> <head> <title></title> <view:looknfeel/> <script type="text/javascript"> $(document).ready(function(){ - $('#accordion').accordion({ - clearStyle: false, - autoHeight: false - }).bind("accordionactivate", function(event, ui) { - doSomething(ui.newHeader[0].id); - }); + displayLocations(); + <c:choose> + <c:when test="${toolbox}"> + viewComponent("<%=componentId%>"); + </c:when> + <c:otherwise> + viewLocalComponent(); + $("#browsingArea").show(); + displaySpaces(); + </c:otherwise> + </c:choose> }); - var doSomething = function(paneId) - { - if (loadedPanes.indexOf(","+paneId+",") != "-1") - { - //Pane already loaded - } - else - { - $.post("<%=routerUrl%>ShowAliasTree?ComponentId="+paneId, function(data){ - $("#content_"+paneId).html(data); - }); - - loadedPanes += paneId+","; - } - }; - - var loadedPanes = ",<%=componentId%>,"; -</script> -<script type="text/javascript"> -function sendData() { - var selectedPaths = getSelectedOjects(); - if (selectedPaths.indexOf(',<%=componentId%>,') == -1) { - jQuery.popup.error('<%=WebEncodeHelper.javaStringToHtmlString(WebEncodeHelper.javaStringToJsString(resources.getString("kmelia.paths.mandatory")))%>'); - } else { - document.getElementById("LoadedComponentIds").value=","+loadedPanes+","; - document.paths.submit(); - } -} - -function topicGoTo(id) { - location.href="GoToTopic?Id="+id; -} - -function getSelectedOjects() { - return getObjects(true); -} - -function getObjects(selected) { - var items = ""; - var boxItems = document.paths.topicChoice; - if (boxItems != null){ - // au moins une checkbox exist - var nbBox = boxItems.length; - if ( (nbBox == null) && (boxItems.checked == selected) ){ - // il n'y a qu'une checkbox non selectionn�e - items += boxItems.value+","; - } else{ - // search not checked boxes - for (i=0;i<boxItems.length ;i++ ){ - if (boxItems[i].checked == selected){ - items += boxItems[i].value+","; - } - } - } - } - return items; -} + function manageLocation(nodeId, componentId, checkbox) { + var locationId = nodeId+"-"+componentId; + var uri = webContext+"/services/private/publications/<%=componentId%>/<%=id%>/locations/"+locationId; + if (checkbox.checked) { + addAlias(uri, locationId) + } else { + deleteAlias(uri, locationId); + } + } + + function displaySpaces() { + viewSpace('0'); + } + + const currentPath = new Map(); + currentPath.set('0', ' '); + + function processPath(spaceId) { + if (spaceId) { + // check if spaceId is not already in path + if (currentPath.has(spaceId)) { + var deleteNext = false; + const oldPath = currentPath; + for (const key of oldPath.keys()) { + if (deleteNext) { + currentPath.delete(key); + } else { + if (key === spaceId) { + deleteNext = true; + } + } + } + } else { + var spaceLabel = $("#space-" + spaceId).text(); + currentPath.set(spaceId, spaceLabel); + } + + var path = ""; + for (const key of currentPath.keys()) { + if (key !== '0') { + path += " > "; + } + var a = "<a href=\"#\" onclick=\"viewSpace('" + key + "'); return false;\">" + currentPath.get(key) + "</a>"; + path += a; + } + $("#currentPath").html(path); + } + } + + function viewSpace(spaceId) { + var uri = webContext+"/services/spaces"; + if (spaceId !== '0') { + uri += "/"+spaceId+"/spaces"; + } + + processPath(spaceId); + emptyComponentTreeview(); + $("#components ul").empty(); + + $("#spaces ul").empty(); + var ajaxRequest = sp.ajaxRequest(uri); + ajaxRequest.send().then(function(response) { + response.responseAsJson().forEach(function(space) { + var li = "<li id=\"space-"+space.id+"\"><a href=\"#\" onclick=\"viewSpace('"+space.id+"'); return false;\">"+space.label+"</a></li>"; + $("#spaces ul").append(li); + }); + }); + if (spaceId !== '0') { + displayComponents(spaceId); + } + } + + function displayComponents(spaceId) { + var uri = webContext+"/services/spaces/"+spaceId+"/components"; + $("#components ul").empty(); + var ajaxRequest = sp.ajaxRequest(uri); + ajaxRequest.send().then(function(response) { + response.responseAsJson().forEach(function(component) { + if (component.name === "kmelia") { + var componentId = component.name+component.id; + var li = "<li id=\""+componentId+"\"><a href=\"#\" onclick=\"viewComponent('"+componentId+"', true); return false;\">"+component.label+"</a></li>"; + $("#components ul").append(li); + } + }); + }); + } + + function viewComponent(componentId, addToPath) { + if (addToPath) { + var componentLabel = $("#"+componentId).text(); + $("#currentPath").append(" > ").append(componentLabel); + } + emptyComponentTreeview(); + $.post("<%=routerUrl%>ShowAliasTree?ComponentId="+componentId, function(data){ + $("#treeviewFolders").html(data); + }); + } + + function viewLocalComponent() { + $.post("<%=routerUrl%>ShowAliasTree?ComponentId=<%=componentId%>", function(data){ + $("#localTreeview").html(data); + }); + } + + function emptyComponentTreeview() { + $("#treeviewFolders").empty(); + } + + function deleteAlias(aliasURI, locationId) { + var ajaxRequest = sp.ajaxRequest(aliasURI).byDeleteMethod(); + ajaxRequest.send().then(function() { + $("#currentLocations #"+locationId).remove(); + $("#localTreeview #"+locationId).prop("checked", false); + $("#treeviewFolders #"+locationId).prop("checked", false); + }); + } + + function addAlias(aliasURI, locationId) { + var ajaxRequest = sp.ajaxRequest(aliasURI).byPutMethod(); + ajaxRequest.send().then(function() { + displayLocations(); + }); + } + + function displayLocations() { + var ajaxRequest = sp.ajaxRequest(webContext+"/services/private/publications/<%=componentId%>/<%=id%>/locations?lang="+getUserLanguage()); + ajaxRequest.send().then(function(response) { + var lis = ""; + response.responseAsJson().forEach(function(location) { + var locationId = location.id+"-"+location.componentId; + var li = "<li id=\""+locationId+"\"><span class=\"location-path\">"+location.path+"</span>"; + if (location.alias) { + li += "<span class=\"location-user\">"+location.user.fullName+"</span>"; + li += "<span class=\"location-date\">"+sp.moment.displayAsDateTime(location.date)+"</span>"; + li += "<a class=\"delete-button\" href=\"#\" onclick=\"deleteAlias('"+location.uri+"', '"+locationId+"')\">Supprimer</a>"; + } + li += "</li>"; + lis += li; + }); + $("#currentLocations ul").html(lis); + }); + } + + function topicGoTo(id) { + location.href="GoToTopic?Id="+id; + } </script> </head> -<body class="kmelia path"> +<body class="kmelia path locations"> <% Window window = gef.getWindow(); Frame frame = gef.getFrame(); @@ -148,165 +240,54 @@ function getObjects(selected) { Board board = gef.getBoard(); out.println(board.printBefore()); - - //regarder si la publication est dans la corbeille - if (NodePK.BIN_NODE_ID.equals(publication.getLocation().getId())) { - //la publi est dans la corbeille - out.println(kmeliaScc.getString("kmelia.PubInBasket")+"<br/><br/>"); - } + + //regarder si la publication est dans la corbeille + if (NodePK.BIN_NODE_ID.equals(publication.getLocation().getId())) { + //la publi est dans la corbeille + out.println("<div class=\"inlineMessage\">"+kmeliaScc.getString("kmelia.PubInBasket")+"</div>"); + } + %> - <form name="paths" action="SetPath" method="post"> - <input type="hidden" name="PubId" value="<%=id%>"/> - <input type="hidden" name="LoadedComponentIds" id="LoadedComponentIds" value=""/> - + <div id="currentLocations"> + <div class="header"> + <h3><fmt:message key="kmelia.paths.local"/></h3> + </div> + <ul></ul> + </div> + + <div id="localLocations"> + <div class="header"> + <h3><fmt:message key="kmelia.paths.local.add"/></h3> + </div> + <div id="localTreeview" class="accordion"></div> + </div> + + <div id="browserLocation"> + <div id="browsingArea" style="display:none;"> + <div class="header"> + <h3><fmt:message key="kmelia.paths.external.add"/></h3> + </div> + <div id="currentPath"></div> + <div id="spaces"> + <h4><fmt:message key="GML.spaces"/></h4> + <ul></ul> + </div> + <div id="components"> + <h4><fmt:message key="GML.components"/></h4> + <ul></ul> + </div> + </div> + <div id="treeview" class="accordion"> + <h4><fmt:message key="GML.folders"/></h4> + <div id="treeviewFolders"></div> + </div> + </div> + <% - if(topics != null && !topics.isEmpty()) { - // toolbox case - out.println("<table>"); - for (NodeDetail topic : topics) { - if (topic.getId() != 1 && topic.getId() != 2) { - String name = topic.getName(currentLang); - - String ind = ""; - if(topic.getLevel() > 2) { // calcul chemin arbre - int sizeOfInd = topic.getLevel() - 2; - if(sizeOfInd > 0) { - for(int i=0;i<sizeOfInd;i++) { - ind += " "; - } - } - } - name = ind + name; - - // recherche si ce thème est dans la liste des locations de la publication - final input topicChoiceInput = new input().setType("checkbox").setName("topicChoice").setValue(topic.getId()+","+topic.getNodePK().getInstanceId()); - topicChoiceInput.addAttribute("valign","absmiddle"); - locations.stream() - .filter(l -> Integer.toString(topic.getId()).equals(l.getId())) - .findFirst() - .ifPresent(l -> { - topicChoiceInput.setChecked(true); - if (!l.isAlias()) { - topicChoiceInput.setReadOnly(true); - topicChoiceInput.setDisabled(true); - topicChoiceInput.setOnClick("return false"); - } - }); - boolean displayCheckbox = false; - if (topic.getUserRole() == null || !topic.getUserRole().equals("user")) { - displayCheckbox = true; - } - out.println("<tr><td width=\"10px\">"); - if (displayCheckbox) { - out.println(topicChoiceInput.toString()); - } else { - out.println(" "); - } - out.println("</td><td>"+name+"</td></tr>"); - } - } - out.println("</table>"); - } else { - // kmelia case - out.println("<div id=\"accordion\" class=\"basic\">"); - - Treeview treeview = null; - String nbAliases = ""; - String panelTitle = ""; - for (int t=0; components != null && t<components.size(); t++) { - treeview = components.get(t); - - nbAliases = ""; - if (t == 0) { - panelTitle = resources.getString("kmelia.paths.local"); - } else { - panelTitle = treeview.getPath(); - } - - if (treeview.getNbAliases() == 1) { - nbAliases = "<span class=\"nb_nbAlias\">"+treeview.getNbAliases()+"</span> <span class=\"libelle_nbAlias\">"+resources.getString("kmelia.paths.path")+"</span>"; - } else if (treeview.getNbAliases() > 1) { - nbAliases = "<span class=\"nb_nbAlias\">"+treeview.getNbAliases()+"</span> <span class=\"libelle_nbAlias\">"+resources.getString("kmelia.paths.paths")+"</span>"; - } - %> - <a href="javascript: void(0)" id="<%=treeview.getComponentId()%>"><div class="panelTitle"><%=panelTitle%></div><div class="nbAlias"><%=nbAliases%></div></a> - <div id="content_<%=treeview.getComponentId()%>" class="content"> - <% - out.println("<table>"); - if (t == 0) { - List<NodeDetail> otherTree = treeview.getTree(); - for (NodeDetail topic : otherTree) { - if (topic.getId() != 1 && topic.getId() != 2) { - String name = topic.getName(currentLang); - - String ind = ""; - if(topic.getLevel() > 2) { // calcul chemin arbre - int sizeOfInd = topic.getLevel() - 2; - if(sizeOfInd > 0) { - for(int i=0;i<sizeOfInd;i++) { - ind += " "; - } - } - } - name = ind + name; - - // recherche si ce dossier est dans la liste des dossiers de la publication - final Mutable<String> aliasDecoration = Mutable.of(""); - final input topicChoiceInput = new input().setType("checkbox").setName("topicChoice").setValue(topic.getId()+","+topic.getNodePK().getInstanceId()); - topicChoiceInput.addAttribute("valign","absmiddle"); - locations.stream() - .filter(l -> Integer.toString(topic.getId()).equals(l.getId()) && topic.getNodePK().getInstanceId().equals(l.getInstanceId())) - .findFirst() - .ifPresent(l -> { - topicChoiceInput.setChecked(true); - if (l.isAlias()) { - aliasDecoration.set("<span> </span><i>"+l.getAlias().getUserName()+" - "+resources.getOutputDateAndHour(l.getAlias().getDate())+"</i>"); - } else { - topicChoiceInput.setReadOnly(true); - topicChoiceInput.setDisabled(true); - topicChoiceInput.setOnClick("return false"); - } - }); - boolean displayCheckbox = false; - if (topic.getUserRole()==null || !topic.getUserRole().equals("user")) { - displayCheckbox = true; - if ("writer".equals(topic.getUserRole())) { - topicChoiceInput.setReadOnly(true); - topicChoiceInput.setDisabled(true); - topicChoiceInput.setOnClick("return false"); - } - } - out.println("<tr><td width=\"10px\">"); - if (displayCheckbox) { - out.println(topicChoiceInput.toString()); - } else { - out.println(" "); - } - out.println("</td><td nowrap=\"nowrap\">"+name+"</td><td align=\"right\">"+aliasDecoration.get()+"</td></tr>"); - } - - } - } else { - out.println("<tr><td>Chargement en cours...</td></tr>"); - } - out.println("</table>"); - %> - </div> - <% - } - out.println("</div>"); - } - out.println("</form>"); - out.println(board.printAfter()); - - ButtonPane buttonPane = gef.getButtonPane(); - buttonPane.addButton(validateButton); - buttonPane.addButton(cancelButton); - out.println("<br/>"+buttonPane.print()); - + out.println(frame.printAfter()); out.println(window.printAfter()); %> </body> -</html> \ No newline at end of file +</html> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationViewOnly.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationViewOnly.jsp index 862196040c..71459ab3d8 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationViewOnly.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationViewOnly.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.kmelia.jstl.KmeliaDisplayHelper"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationsList.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationsList.jsp index 0a5e919f51..9bb5d14061 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationsList.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationsList.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationsToValidate.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationsToValidate.jsp index d6c5f13d03..867866c376 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationsToValidate.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/publicationsToValidate.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/readingControlManager.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/readingControlManager.jsp index ddf57c987d..4346ddc7fd 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/readingControlManager.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/readingControlManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/reportImportFiles.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/reportImportFiles.jsp index 5d987fcbf4..424e018c78 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/reportImportFiles.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/reportImportFiles.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/repository.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/repository.jsp index 594254b896..4ad5fed5fa 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/repository.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/repository.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/simpleListOfPublications.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/simpleListOfPublications.jsp index a5bebbf56e..72e4b01f03 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/simpleListOfPublications.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/simpleListOfPublications.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/statisticsTopic.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/statisticsTopic.jsp index 0e8dc18529..f5052e8b21 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/statisticsTopic.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/statisticsTopic.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/kmelia.css b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/kmelia.css index 8c19cebd09..7b0169cf00 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/kmelia.css +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/kmelia.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ html , body.treeView, @@ -453,6 +453,16 @@ body.treeView > div[id*="kmelia"] > div.kmelia #topPage .cellBodyWindows{ background: url("../../../kmelia/jsp/icons/pack_big_icons.gif") 3px -696px no-repeat; border:1px solid #FFFBBB ; background-color:#FFFFDC;} + +#subTopics ul li#topic_notvisibleContributions a { + background: url("../../../kmelia/jsp/icons/pack_big_icons.gif") 3px -796px no-repeat; + border:1px solid #EAEAEA ; + border-radius:10px; + background-color:#EAEAEA;} +#subTopics ul li#topic_notvisibleContributions a:hover { + background: url("../../../kmelia/jsp/icons/pack_big_icons.gif") 3px -896px no-repeat; + border:1px solid #FFFBBB ; + background-color:#FFFFDC;} #subTopics ul li a strong { display:block; @@ -812,6 +822,7 @@ a.button.refuse span { } + .wrap #rightSide.resizable > div { margin:0 2em 1em 4em; } @@ -1054,13 +1065,180 @@ a.button.refuse span { /*** emplacement ***/ -.kmelia.path #accordion .content { +#currentLocations { + float: right; + padding-left: 3%; + margin-right: 2%; + padding-top: 1em; + width: 33%; + border-left: 1px solid #ccc; + min-height: 300px; +} +#currentLocations ul { + list-style-type:none; + padding:0; + margin:0; +} + +#currentLocations ul li { + padding:1em; + border-bottom:1px solid #eee; + position:relative; +} +#currentLocations ul li .location-path{ + color:#000; + font-weight:600; +} + +#currentLocations ul li .location-user{ + display:block; + color:#1c94d4; + font-weight:400; +} +#currentLocations ul li .location-date{ + color:#777; +} + +#currentLocations li a.delete-button { + display: block; + text-indent: -3000em; + position: absolute; + bottom:1em; + right: 1em; + width: 16px; + height: 20px; + padding: 0; + z-index: 1000; +} + +#currentLocations li:hover .delete-button { + background: transparent url(../../../util/icons/delete.gif) 0 0 no-repeat; +} + +#localLocations, #browserLocation{ + width: 58%; + float: left; + margin-left: 0; + margin-right: 3%; + margin-bottom: 2em; +} + +#localLocations #localTreeview { + max-height:250px; + overflow: auto; +} + +#browserLocation #currentPath { + background-color:#f5f5f5; + border-bottom:1px solid #DDD; + padding:1em; +} + +#browserLocation #currentPath > a:first-child { + text-indent:-300em; + background:transparent url(../../../util/icons/Home.gif) 0 -1px no-repeat; + display:inline-block; + width:22px; +} + +#browserLocation #currentPath a{ + color: #1c94d4; + text-decoration:underline; +} +#browserLocation #currentPath a:last-child{ + font-weight:bold; + color:inherit; + text-decoration:none; +} +#browserLocation #spaces , +#browserLocation #components, +#browserLocation #treeview { + padding:0; + margin:1em 1em 1em 0; + float:left; + + border:1px solid #DDD; + height:300px; + overflow:auto; +} +#browserLocation #spaces, +#browserLocation #components { + min-width:7em; +} +#browserLocation #treeview { + margin-right:0; + min-width:calc(33.3% - 2px); + +} +#browserLocation #spaces ul , +#browserLocation #components ul, +#browserLocation #treeview table{ + padding:0; + margin:0; + list-style:none; +} +#browserLocation #spaces ul li , +#browserLocation #components ul li { + min-width:13em; +} + +#browserLocation #treeview table{ + width:100%; +} +#browserLocation #treeview table tr td:first-child{ + padding:0.25em 1em; +} +#browserLocation #spaces ul li , +#browserLocation #components ul li{ + padding:0.5em 1em; + border-bottom:1px solid #DDD; +} +#browserLocation #spaces ul li a, +#browserLocation #components ul li a{ + display:block; +} +#browserLocation #spaces li a { + background:transparent url(../../../util/icons/treeview/plus.gif) 0 0 no-repeat; + padding-left:24px; +} +#browserLocation #components li a { + background:transparent url(../../../util/icons/component/kmeliaSmall.gif) 0 -2px no-repeat; + padding-left:24px; +} + +#browserLocation #components h4, +#browserLocation #spaces h4, +#browserLocation #treeview h4 { + display:block; + text-align:center; + border-bottom:1px solid #DDD; + font-weight:bold; + padding:1em 0; + margin:0; + +} +.kmelia.path .header h3 { + padding: 0; + margin: 0 0 1em; + font-size: 130%; + font-weight:400; + line-height: 90%; +} + +.kmelia.path .header h3 strong { + display: block; + font-size: 90%; + font-weight:400; + color: #1c94d4; +} + +.kmelia.path .accordion .content { padding: .5em .5em .5em .7em; overflow: auto; max-height: 250px; } -.kmelia.path #accordion .basic a { +.kmelia.path .accordion .basic a { cursor:pointer; display:block; text-decoration: none; @@ -1071,32 +1249,58 @@ a.button.refuse span { background: linear-gradient(180deg , rgb(255, 255, 255) 0%, rgb(229, 229, 229) 100%); } -.kmelia.path #accordion .ui-icon { +.kmelia.path .accordion .ui-icon { display: none; } -.kmelia.path #accordion .nbAlias { +.kmelia.path .accordion .nbAlias { position:absolute; right:1em; top:0.5em; } -.kmelia.path #accordion .ui-corner-top{ +.kmelia.path .accordion .ui-corner-top{ position:relative; } -.kmelia.path #accordion table{ - width:100%; +.kmelia.path #treeviewFolders { + max-height: 258px; + overflow: auto; + padding-right: 20px; } -.kmelia.path #accordion table td { - padding:0.25em; +.kmelia.path #localTreeview table{ + width:100%; +} +.kmelia.path .accordion table td{ + padding:0.15em 0.25em; border-bottom:1px solid #eee; } -.kmelia.path #accordion table tr:nth-child(2n) { +.kmelia.path .accordion table tr:nth-child(2n), +#currentLocations ul li:nth-child(2n) { background-color:#FFF } -.kmelia.path #accordion table tr:nth-child(2n+1) { +.kmelia.path .accordion table tr:nth-child(2n+1), +#currentLocations ul li:nth-child(2n+1) { background-color:#f5f5f5; } + + @media only screen and (max-width: 780px) { + + #currentLocations { + float: none; + padding:0; + margin:0 0 2em 0; + width:100%; + border-left:0; + min-height: auto; + + } + #localLocations, #browserLocation { + width: 100%; + float: none; + padding:0; + margin:0 0 2em 0; + } + } \ No newline at end of file diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/pubHighlight.css b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/pubHighlight.css index efdb7f6660..a2a875a0ae 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/pubHighlight.css +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/pubHighlight.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ .highlight-silver { diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/tree.css b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/tree.css index 64d880b991..db0c245e5e 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/tree.css +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/styleSheets/tree.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ .ygtvtn { background: url(../icons/treeview/tn.gif) 0 0 no-repeat; width:17px; height:22px; } diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/topicProfiles.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/topicProfiles.jsp index 631b54881d..27d62e3a9e 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/topicProfiles.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/topicProfiles.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/treeview.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/treeview.jsp index 3dc41fb904..80e7422f48 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/treeview.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/treeview.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.kmelia.KmeliaPublicationHelper"%> @@ -661,7 +661,7 @@ function spreadNbItems(children) { if (children) { for(var i = 0; i < children.length; i++) { var child = children[i]; - child.attr['title'] = child.attr['description'].unescapeHTML(); + child.a_attr = { title: child.attr['description'].unescapeHTML()}; <% if (kmeliaScc.isOrientedWebContent()) { %> child.li_attr = { class: child.attr['status'] }; <% } %> @@ -1043,4 +1043,4 @@ $(document).on("dnd_stop.vakata", function(event, data) { var myapp = angular.module('silverpeas.kmelia', ['silverpeas.services', 'silverpeas.directives']); </script> </body> -</html> \ No newline at end of file +</html> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/treeview4PublicationPaths.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/treeview4PublicationPaths.jsp index c050f1d1a3..7928eff287 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/treeview4PublicationPaths.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/treeview4PublicationPaths.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,74 +20,86 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page import="java.util.List"%> -<%@ page import="java.util.Iterator"%> <%@ page import="org.silverpeas.core.node.model.NodeDetail"%> <%@ page import="org.silverpeas.core.contribution.publication.model.Location" %> <%@ page import="org.silverpeas.core.util.MultiSilverpeasBundle"%> -<%@ page import="org.silverpeas.core.util.WebEncodeHelper" %> +<%@ page import="org.silverpeas.core.util.Mutable" %> +<%@ page import="org.apache.ecs.xhtml.input" %> +<%@ page import="org.owasp.encoder.Encode" %> <% MultiSilverpeasBundle resources = (MultiSilverpeasBundle)request.getAttribute("resources"); List<NodeDetail> otherTree = (List<NodeDetail>) request.getAttribute("Tree"); String currentLang = (String) request.getAttribute("Language"); -List<Location> locations = (List<Location>) request.getAttribute("Aliases"); +List<Location> locations = (List<Location>) request.getAttribute("Locations"); %> +<% if (otherTree != null) { %> <table> - <caption></caption> <th id="locations"></th> <% -for(NodeDetail topic: otherTree) -{ - if (topic.getId() != 1 && topic.getId() != 2) - { - String name = WebEncodeHelper.convertHTMLEntities(topic.getName(currentLang)); + for (NodeDetail topic : otherTree) { + if (topic.getId() != 1 && topic.getId() != 2) { + String name = Encode.forHtml(topic.getName(currentLang)); - String ind = ""; - if(topic.getLevel() > 2) - {// calcul chemin arbre - int sizeOfInd = topic.getLevel() - 2; - if(sizeOfInd > 0) - { - for(int i=0;i<sizeOfInd;i++) - { - ind += " "; - } - } - } - name = ind + name; + StringBuilder ind = new StringBuilder(); + if(topic.getLevel() > 2) { // calcul chemin arbre + int sizeOfInd = topic.getLevel() - 2; + if(sizeOfInd > 0) { + for(int i=0;i<sizeOfInd;i++) { + ind.append(" "); + } + } + } + name = ind + name; - // recherche si ce th�me est dans la liste des th�mes de la publication - String aliasDecoration = " "; - String checked = ""; - for(Location location: locations) - { - String nodeId = location.getId(); + // recherche si ce dossier est dans la liste des dossiers de la publication + final Mutable<String> aliasDecoration = Mutable.of(""); + final input topicChoiceInput = new input().setType("checkbox").setName("topicChoice").setValue(topic.getId()+","+topic.getNodePK().getInstanceId()); + topicChoiceInput.setID(topic.getId()+"-"+topic.getNodePK().getInstanceId()); + topicChoiceInput.addAttribute("valign","absmiddle"); + topicChoiceInput.setOnClick("manageLocation('"+topic.getId()+"','"+topic.getNodePK().getInstanceId()+"', this)"); + locations.stream() + .filter(l -> Integer.toString(topic.getId()).equals(l.getId()) && topic.getNodePK().getInstanceId().equals(l.getInstanceId())) + .findFirst() + .ifPresent(l -> { + topicChoiceInput.setChecked(true); + if (l.isAlias()) { + aliasDecoration.set("<span> </span><i>"+l.getAlias().getUserName()+" - "+resources.getOutputDateAndHour(l.getAlias().getDate())+"</i>"); + } else { + topicChoiceInput.setReadOnly(true); + topicChoiceInput.setDisabled(true); + topicChoiceInput.setOnClick("return false"); + } + }); + boolean displayCheckbox = false; + if (topic.getUserRole()==null || !topic.getUserRole().equals("user")) { + displayCheckbox = true; + if ("writer".equals(topic.getUserRole())) { + topicChoiceInput.setReadOnly(true); + topicChoiceInput.setDisabled(true); + topicChoiceInput.setOnClick("return false"); + } + } + out.println("<tr><td width=\"10px\">"); + if (displayCheckbox) { + out.println(topicChoiceInput.toString()); + } else { + out.println(" "); + } + out.println("</td><td nowrap=\"nowrap\">"+name+"</td><td align=\"right\">"+aliasDecoration.get()+"</td></tr>"); + } - if (location.isNode(topic)) - { - checked = " checked"; - aliasDecoration = "<i>"+WebEncodeHelper.convertHTMLEntities(location.getAlias().getUserName())+" - "+resources.getOutputDateAndHour( - location.getAlias().getDate())+"</i>"; - } - } - boolean displayCheckbox = false; - if (topic.getUserRole() ==null || topic.getUserRole().equals("admin") || topic.getUserRole().equals("publisher")) - displayCheckbox = true; - out.println("<tr><td width=\"10px\">"); - if (displayCheckbox) - out.println("<input type=\"checkbox\" valign=\"absmiddle\" name=\"topicChoice\" value=\""+topic.getId()+","+topic.getNodePK().getInstanceId()+"\""+checked+">"); - else - out.println(" "); - out.println("</td><td nowrap=\"nowrap\">"+name+"</td><td align=\"right\">"+aliasDecoration+"</td></tr>"); - } -} + } %> -</table> \ No newline at end of file +</table> +<% } else { %> + Vous ne pouvez pas publier dans cette application... +<% }%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/updateTopicNew.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/updateTopicNew.jsp index a238a7cc21..4a4f44007a 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/updateTopicNew.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/updateTopicNew.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.i18n.I18NHelper"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/validateImportedFilesClassification.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/validateImportedFilesClassification.jsp index 78071416fb..ec7a413aad 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/validateImportedFilesClassification.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/validateImportedFilesClassification.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/validationSteps.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/validationSteps.jsp index 2fd3268571..e812a0cd4a 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/validationSteps.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/validationSteps.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/xmlForm.jsp b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/xmlForm.jsp index e8707226bb..0404ebbeeb 100644 --- a/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/xmlForm.jsp +++ b/kmelia/kmelia-war/src/main/webapp/kmelia/jsp/xmlForm.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> diff --git a/kmelia/pom.xml b/kmelia/pom.xml index 4247d2bff2..3179a25b32 100644 --- a/kmelia/pom.xml +++ b/kmelia/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/license.txt b/license.txt index dba13ed2dd..be3f7b28e5 100644 --- a/license.txt +++ b/license.txt @@ -1,7 +1,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. +<https://www.gnu.org/licenses/>. diff --git a/mailinglist/mailinglist-configuration/pom.xml b/mailinglist/mailinglist-configuration/pom.xml index a740c831fe..4ef8020beb 100644 --- a/mailinglist/mailinglist-configuration/pom.xml +++ b/mailinglist/mailinglist-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>mailinglist</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.mailinglist</groupId> diff --git a/mailinglist/mailinglist-configuration/src/main/config/migrations/modules/mailinglist-migration.xml b/mailinglist/mailinglist-configuration/src/main/config/migrations/modules/mailinglist-migration.xml index b0d9899439..cad4b33a39 100644 --- a/mailinglist/mailinglist-configuration/src/main/config/migrations/modules/mailinglist-migration.xml +++ b/mailinglist/mailinglist-configuration/src/main/config/migrations/modules/mailinglist-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="mailingList" xmlns="http://silverpeas.org/xml/ns/migration" diff --git a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle.properties b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle.properties index 224e7b40ea..617b063af9 100644 --- a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle.properties +++ b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # mailinglist.notification.title=[{0}] : {1} mailinglist.notification.template.title=[$mailingListName$] : $title$ diff --git a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_de.properties b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_de.properties index 204c333655..2a75b3b73a 100644 --- a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_de.properties +++ b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # mailinglist.notification.title=[{0}] : {1} diff --git a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_en.properties b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_en.properties index ff2749feee..11417e0588 100644 --- a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_en.properties +++ b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # mailinglist.notification.title=[{0}] : {1} mailinglist.notification.body=<html><head/><body><p>[{0}]</p><a href=\"{1}\">Click here</a></body></html> diff --git a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_fr.properties b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_fr.properties index 224e7b40ea..617b063af9 100644 --- a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_fr.properties +++ b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/multilang/mailinglistBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # mailinglist.notification.title=[{0}] : {1} mailinglist.notification.template.title=[$mailingListName$] : $title$ diff --git a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/notification.properties b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/notification.properties index e9cd942b00..6715953b8e 100644 --- a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/notification.properties +++ b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/notification.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # mailinglist.notification.title=[{0}] : {1} mailinglist.notification.body=<html><head/><body><p>[{0}]</p><a href\="{1}">Cliquez ici</a></body></html> diff --git a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/settings/mailinglistIcons.properties b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/settings/mailinglistIcons.properties index 94ceaf84e9..d723eaa02d 100644 --- a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/settings/mailinglistIcons.properties +++ b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/settings/mailinglistIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # mailingList.icons.user.delete=/util/icons/infoLetter_delSubscriber.gif mailingList.icons.user.add=/util/icons/infoLetter_addSubscriber.gif diff --git a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/settings/mailinglistSettings.properties b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/settings/mailinglistSettings.properties index b6f467c9c8..f325bef761 100644 --- a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/settings/mailinglistSettings.properties +++ b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/mailinglist/settings/mailinglistSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # #Specify if the key ST_PASSWORD must be processed or not #possible values = true, false diff --git a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/util/logging/mailinglistLogging.properties b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/util/logging/mailinglistLogging.properties index 024947a070..96d536dbd0 100644 --- a/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/util/logging/mailinglistLogging.properties +++ b/mailinglist/mailinglist-configuration/src/main/config/properties/org/silverpeas/util/logging/mailinglistLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/mailinglist/mailinglist-configuration/src/main/config/xmlcomponents/mailinglist.xml b/mailinglist/mailinglist-configuration/src/main/config/xmlcomponents/mailinglist.xml index 9073817886..fbea8c77e6 100644 --- a/mailinglist/mailinglist-configuration/src/main/config/xmlcomponents/mailinglist.xml +++ b/mailinglist/mailinglist-configuration/src/main/config/xmlcomponents/mailinglist.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/mailinglist/mailinglist-library/pom.xml b/mailinglist/mailinglist-library/pom.xml index cf7f5d4ddb..70f868bbdc 100644 --- a/mailinglist/mailinglist-library/pom.xml +++ b/mailinglist/mailinglist-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>mailinglist</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.mailinglist</groupId> diff --git a/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/MailingListWarBuilder.java b/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/MailingListWarBuilder.java index a46b2e5d80..e45e0465da 100644 --- a/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/MailingListWarBuilder.java +++ b/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/MailingListWarBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist; diff --git a/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/MailingListServiceIT.java b/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/MailingListServiceIT.java index f51fb2cf26..b2e9f635c6 100644 --- a/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/MailingListServiceIT.java +++ b/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/MailingListServiceIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model; diff --git a/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/MessageServiceIT.java b/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/MessageServiceIT.java index 0fdc38ed4c..9356e6c5b7 100644 --- a/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/MessageServiceIT.java +++ b/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/MessageServiceIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model; diff --git a/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDaoIT.java b/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDaoIT.java index da09485b09..13f45d37a5 100644 --- a/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDaoIT.java +++ b/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDaoIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.dao; diff --git a/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDaoIT.java b/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDaoIT.java index d4f7315f58..348e0f0921 100644 --- a/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDaoIT.java +++ b/mailinglist/mailinglist-library/src/integration-test/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDaoIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.dao; diff --git a/mailinglist/mailinglist-library/src/integration-test/resources/arquillian.xml b/mailinglist/mailinglist-library/src/integration-test/resources/arquillian.xml index fc68726bc5..ebca1fdd1e 100644 --- a/mailinglist/mailinglist-library/src/integration-test/resources/arquillian.xml +++ b/mailinglist/mailinglist-library/src/integration-test/resources/arquillian.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <arquillian xmlns="http://jboss.org/schema/arquillian" @@ -37,8 +37,8 @@ <container qualifier="wildfly-managed" default="true"> <configuration> <property name="serverConfig">standalone-full.xml</property> - <property name="startupTimeoutInSeconds">120</property> - <property name="allowConnectingToRunningServer">true</property> + <property name="startupTimeoutInSeconds">300</property> + <property name="allowConnectingToRunningServer">false</property> <property name="javaVmArguments">-Xms512M -Xmx2G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</property> <!-- uncomment it for debugging integration test --> <!-- @@ -46,4 +46,4 @@ --> </configuration> </container> -</arquillian> \ No newline at end of file +</arquillian> diff --git a/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/index/indexing/Parser.properties b/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/index/indexing/Parser.properties index eb6d531fbe..c844ac4117 100644 --- a/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/index/indexing/Parser.properties +++ b/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/index/indexing/Parser.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # for each file format, the corresponding parser diff --git a/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/notificationserver/channel/smtp/smtpSettings.properties b/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/notificationserver/channel/smtp/smtpSettings.properties index 32710f5955..887c92bf1c 100644 --- a/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/notificationserver/channel/smtp/smtpSettings.properties +++ b/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/notificationserver/channel/smtp/smtpSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # SMTPAuthentication=false SMTPUser=bsimpson diff --git a/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/util/attachment/Attachment.properties b/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/util/attachment/Attachment.properties index 8e606dee0c..9e14cdc9c8 100644 --- a/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/util/attachment/Attachment.properties +++ b/mailinglist/mailinglist-library/src/integration-test/resources/org/silverpeas/util/attachment/Attachment.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # Properties of Attachment # ------------------------- diff --git a/mailinglist/mailinglist-library/src/integration-test/resources/test-ds.xml b/mailinglist/mailinglist-library/src/integration-test/resources/test-ds.xml index eaddc0bfad..55db3df229 100644 --- a/mailinglist/mailinglist-library/src/integration-test/resources/test-ds.xml +++ b/mailinglist/mailinglist-library/src/integration-test/resources/test-ds.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <datasources xmlns="http://www.jboss.org/ironjacamar/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailingListStatistics.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailingListStatistics.java index 211eafd05a..4a907168c1 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailingListStatistics.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailingListStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailinglistInstancePostConstruction.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailinglistInstancePostConstruction.java index 91cbeecbbb..ebcd17e55b 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailinglistInstancePostConstruction.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailinglistInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailinglistInstancePreDestruction.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailinglistInstancePreDestruction.java index a1cf1cd5dd..2d3b37724f 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailinglistInstancePreDestruction.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/MailinglistInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/model/MailingListComponent.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/model/MailingListComponent.java index 3d100ba0dd..de83dd8fca 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/model/MailingListComponent.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/model/MailingListComponent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.model; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/model/MailingListRuntimeException.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/model/MailingListRuntimeException.java index e4cd587592..acc48c58ee 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/model/MailingListRuntimeException.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/model/MailingListRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.model; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/MailCheckerInitialize.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/MailCheckerInitialize.java index 113e3f400d..74881da47b 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/MailCheckerInitialize.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/MailCheckerInitialize.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/MailingListServicesProvider.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/MailingListServicesProvider.java index 9cb33b0b1e..d90ce65252 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/MailingListServicesProvider.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/MailingListServicesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/event/MessageEvent.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/event/MessageEvent.java index c8cb300c88..2900809ced 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/event/MessageEvent.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/event/MessageEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.event; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/event/MessageListener.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/event/MessageListener.java index d2ef5fa0dc..2cc0b8e7d8 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/event/MessageListener.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/event/MessageListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.event; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/BetterMimeMessage.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/BetterMimeMessage.java index 656ce82368..4b0d51fa9f 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/BetterMimeMessage.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/BetterMimeMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.job; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/MailProcessor.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/MailProcessor.java index 8d390b33f7..839bae1bab 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/MailProcessor.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/MailProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.job; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/MessageChecker.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/MessageChecker.java index 3bfc5c71ae..b8a32c5fd2 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/MessageChecker.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/job/MessageChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.job; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MailingListService.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MailingListService.java index fe6f6a8c9f..187238bc84 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MailingListService.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MailingListService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MailingListServiceImpl.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MailingListServiceImpl.java index 48f7095b50..55b17f6c66 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MailingListServiceImpl.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MailingListServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageIndexer.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageIndexer.java index e8eaab7aa5..14aa4e0022 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageIndexer.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageService.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageService.java index 0e078b5a61..87ebcc2224 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageService.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageServiceImpl.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageServiceImpl.java index c60567e55f..6808fe0732 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageServiceImpl.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/MessageServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Activity.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Activity.java index 8d8ac6bec4..d993f844f5 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Activity.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Activity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Attachment.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Attachment.java index 1387fc2e87..63c5d14b4e 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Attachment.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Attachment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/ExternalUser.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/ExternalUser.java index c5280b0da9..ee31fdf6ad 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/ExternalUser.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/ExternalUser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/IdentifiableObject.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/IdentifiableObject.java index c9d3bb474e..ce7d2eb840 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/IdentifiableObject.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/IdentifiableObject.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalGroupSubscriber.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalGroupSubscriber.java index e99d2df70b..c20bdafa50 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalGroupSubscriber.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalGroupSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalSubscriber.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalSubscriber.java index 9f3ad8c492..ee41178828 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalSubscriber.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalUser.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalUser.java index 6449be0d31..f93a40b115 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalUser.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalUser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalUserSubscriber.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalUserSubscriber.java index 743fd81e67..4706ebb343 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalUserSubscriber.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/InternalUserSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/MailingList.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/MailingList.java index 77b165c205..7822e5d94b 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/MailingList.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/MailingList.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/MailingListActivity.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/MailingListActivity.java index d4c755c4c2..85b314a34d 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/MailingListActivity.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/MailingListActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Message.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Message.java index 2b004f196e..faa0cc2c1d 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Message.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/beans/Message.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDao.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDao.java index 1865b92dc2..e6421f7878 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDao.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.dao; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDaoImpl.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDaoImpl.java index c6cebae761..55246a6412 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDaoImpl.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MailingListDaoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.dao; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDao.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDao.java index 1d85527ae7..10a376a06e 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDao.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.dao; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDaoImpl.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDaoImpl.java index 9fb1cb4d46..2ad7939afd 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDaoImpl.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/model/dao/MessageDaoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.dao; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/AbstractNotificationFormatter.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/AbstractNotificationFormatter.java index 25af80d6ee..afc5767a4f 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/AbstractNotificationFormatter.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/AbstractNotificationFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.notification; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/AdvancedNotificationFormatter.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/AdvancedNotificationFormatter.java index f356ed85dd..7ccd9e8607 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/AdvancedNotificationFormatter.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/AdvancedNotificationFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.notification; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/NotificationFormatter.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/NotificationFormatter.java index 8c0bdfc006..a0c2939187 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/NotificationFormatter.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/NotificationFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.notification; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/NotificationHelper.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/NotificationHelper.java index 60e2fa422e..2988fb35be 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/NotificationHelper.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/NotificationHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.notification; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/SimpleNotificationFormatter.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/SimpleNotificationFormatter.java index bee8eac15c..d3d08f7fad 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/SimpleNotificationFormatter.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/notification/SimpleNotificationFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.notification; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/Html2Text.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/Html2Text.java index 910af04be1..786433d1a7 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/Html2Text.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/Html2Text.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.util; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/HtmlCleaner.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/HtmlCleaner.java index 7e357de1fc..49bca02caf 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/HtmlCleaner.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/HtmlCleaner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.util; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/OrderBy.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/OrderBy.java index ae37e1657a..6cc1140d73 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/OrderBy.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/OrderBy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.util; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/EntityReplaceWriter.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/EntityReplaceWriter.java index 881fb7faf4..9d188469c8 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/EntityReplaceWriter.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/EntityReplaceWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.util.neko; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/NekoElementRemover.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/NekoElementRemover.java index 63a0d04d57..078e7e517e 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/NekoElementRemover.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/NekoElementRemover.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.util.neko; diff --git a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/NekoHtmlCleaner.java b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/NekoHtmlCleaner.java index ae29bdfedc..fde7b898ca 100644 --- a/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/NekoHtmlCleaner.java +++ b/mailinglist/mailinglist-library/src/main/java/org/silverpeas/components/mailinglist/service/util/neko/NekoHtmlCleaner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.util.neko; diff --git a/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/job/BetterMimeMessageTest.java b/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/job/BetterMimeMessageTest.java index 91e33a3ab3..bf89bb87be 100644 --- a/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/job/BetterMimeMessageTest.java +++ b/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/job/BetterMimeMessageTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.job; diff --git a/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/model/beans/TestExternalUser.java b/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/model/beans/TestExternalUser.java index b34840d56e..11b6adf44c 100644 --- a/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/model/beans/TestExternalUser.java +++ b/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/model/beans/TestExternalUser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/model/beans/TestMessage.java b/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/model/beans/TestMessage.java index 29441ded46..476ded0440 100644 --- a/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/model/beans/TestMessage.java +++ b/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/model/beans/TestMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.model.beans; diff --git a/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/util/TestHtml2Text.java b/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/util/TestHtml2Text.java index 40f0746f71..23d7a7dcba 100644 --- a/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/util/TestHtml2Text.java +++ b/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/util/TestHtml2Text.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.util; diff --git a/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/util/TestNekoHtml2Text.java b/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/util/TestNekoHtml2Text.java index 590747773f..f673e870f5 100644 --- a/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/util/TestNekoHtml2Text.java +++ b/mailinglist/mailinglist-library/src/test/java/org/silverpeas/components/mailinglist/service/util/TestNekoHtml2Text.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.service.util; diff --git a/mailinglist/mailinglist-library/src/test/resources/maven.properties b/mailinglist/mailinglist-library/src/test/resources/maven.properties index a1613e4d93..a91fefa61a 100644 --- a/mailinglist/mailinglist-library/src/test/resources/maven.properties +++ b/mailinglist/mailinglist-library/src/test/resources/maven.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # build.dir=${project.build.directory}/temp diff --git a/mailinglist/mailinglist-library/src/test/resources/org/silverpeas/lookAndFeel/generalLook.properties b/mailinglist/mailinglist-library/src/test/resources/org/silverpeas/lookAndFeel/generalLook.properties index f000d43ba4..5c79c82039 100644 --- a/mailinglist/mailinglist-library/src/test/resources/org/silverpeas/lookAndFeel/generalLook.properties +++ b/mailinglist/mailinglist-library/src/test/resources/org/silverpeas/lookAndFeel/generalLook.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # // Page de login par d\ufffdfaut loginPage = diff --git a/mailinglist/mailinglist-war/pom.xml b/mailinglist/mailinglist-war/pom.xml index a15ae405f5..b761584f6e 100644 --- a/mailinglist/mailinglist-war/pom.xml +++ b/mailinglist/mailinglist-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>mailinglist</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.mailinglist</groupId> diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/MailinglistIndexer.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/MailinglistIndexer.java index 6577cb652c..d8bfe9c625 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/MailinglistIndexer.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/MailinglistIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/control/MailingListSessionController.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/control/MailingListSessionController.java index c2c756450f..c17f9c7a4a 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/control/MailingListSessionController.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/control/MailingListSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.control; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/ActivitiesProcessor.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/ActivitiesProcessor.java index 04f9541ab4..159a9ff53c 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/ActivitiesProcessor.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/ActivitiesProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/AttachmentServlet.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/AttachmentServlet.java index 0f55b11d81..3bc0ba79c8 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/AttachmentServlet.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/AttachmentServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/DisplayableAttachment.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/DisplayableAttachment.java index d0ef4bcd7e..661d409c76 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/DisplayableAttachment.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/DisplayableAttachment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/GoToMessage.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/GoToMessage.java index d8aa649911..b615067f01 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/GoToMessage.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/GoToMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListProcessor.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListProcessor.java index 06bb91bb83..d002b8a292 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListProcessor.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListRequestRouter.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListRequestRouter.java index d013a9ed31..556da9616e 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListRequestRouter.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListRoutage.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListRoutage.java index 978e53012e..a05e691f9c 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListRoutage.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MailingListRoutage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MessageProcessor.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MessageProcessor.java index 1ab1e0102f..d98e2f9fb7 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MessageProcessor.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/MessageProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/ModerationProcessor.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/ModerationProcessor.java index 889e20ad61..eb1c364c1f 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/ModerationProcessor.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/ModerationProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/PortletProcessor.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/PortletProcessor.java index 720e012354..6107337507 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/PortletProcessor.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/PortletProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/RestRequest.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/RestRequest.java index 85db234497..6fb59cbb68 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/RestRequest.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/RestRequest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/RssMailingListServlet.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/RssMailingListServlet.java index 3ab9a06349..8611cee75e 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/RssMailingListServlet.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/RssMailingListServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/SubscribersProcessor.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/SubscribersProcessor.java index 12c52f64aa..ecc023edd1 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/SubscribersProcessor.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/SubscribersProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/UsersProcessor.java b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/UsersProcessor.java index 3ea4a534a6..1b419ff6a0 100644 --- a/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/UsersProcessor.java +++ b/mailinglist/mailinglist-war/src/main/java/org/silverpeas/components/mailinglist/servlets/UsersProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mailinglist.servlets; diff --git a/mailinglist/mailinglist-war/src/main/webapp/WEB-INF/web.xml b/mailinglist/mailinglist-war/src/main/webapp/WEB-INF/web.xml index d462dc2e21..93976ed969 100644 --- a/mailinglist/mailinglist-war/src/main/webapp/WEB-INF/web.xml +++ b/mailinglist/mailinglist-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/activity.jsp b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/activity.jsp index 491bd32551..6486d5b752 100644 --- a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/activity.jsp +++ b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/activity.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/check.jsp b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/check.jsp index 4991acb28a..17522c7707 100644 --- a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/check.jsp +++ b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/list.jsp b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/list.jsp index 10d16917b0..1169fd11de 100644 --- a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/list.jsp +++ b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/list.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/message.jsp b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/message.jsp index ae34233fbc..17e1fb6b4e 100644 --- a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/message.jsp +++ b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/message.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/moderation.jsp b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/moderation.jsp index 41e34ec377..89e584d5fb 100644 --- a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/moderation.jsp +++ b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/moderation.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/portlet.jsp b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/portlet.jsp index a49548e591..98baa45d62 100644 --- a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/portlet.jsp +++ b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/users.jsp b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/users.jsp index ab7c5c8214..a02a16fe11 100644 --- a/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/users.jsp +++ b/mailinglist/mailinglist-war/src/main/webapp/mailingList/jsp/users.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/mailinglist/pom.xml b/mailinglist/pom.xml index 0733e9a952..fd44a50801 100644 --- a/mailinglist/pom.xml +++ b/mailinglist/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/mydb/mydb-configuration/pom.xml b/mydb/mydb-configuration/pom.xml index abd9ea8d9b..5ed8964d17 100644 --- a/mydb/mydb-configuration/pom.xml +++ b/mydb/mydb-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>mydb</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.mydb</groupId> diff --git a/mydb/mydb-configuration/src/main/config/migrations/modules/mydb-migration.xml b/mydb/mydb-configuration/src/main/config/migrations/modules/mydb-migration.xml index 6292e18ad1..86523d38c7 100644 --- a/mydb/mydb-configuration/src/main/config/migrations/modules/mydb-migration.xml +++ b/mydb/mydb-configuration/src/main/config/migrations/modules/mydb-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <migration module="myDB" xmlns="http://silverpeas.org/xml/ns/migration" diff --git a/mydb/mydb-configuration/src/main/config/migrations/scripts/myDB/up002/setDataSourceFromJdbcUrl.groovy b/mydb/mydb-configuration/src/main/config/migrations/scripts/myDB/up002/setDataSourceFromJdbcUrl.groovy index c33c7dfa87..72caa83fdc 100644 --- a/mydb/mydb-configuration/src/main/config/migrations/scripts/myDB/up002/setDataSourceFromJdbcUrl.groovy +++ b/mydb/mydb-configuration/src/main/config/migrations/scripts/myDB/up002/setDataSourceFromJdbcUrl.groovy @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /** diff --git a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb.properties b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb.properties index b98125dcd4..ad55cb2b3d 100644 --- a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb.properties +++ b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,49 +19,53 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # -mydb.error.invalidConnectionSettings = param\u00e8tres de connexion incorrects -mydb.error.tooLongValue = champ trop long -mydb.error.valueNotNumber = champ entier requis -mydb.dataSourceSetting=Param\u00e8tres de connexion +mydb.error.tooLongValue = Too many characters +mydb.error.valueNotNumber = Integer field required +mydb.dataSourceSetting=Connection settings mydb.tableView=Tables -mydb.identifier = Identifiant -mydb.password = Mot de passe -mydb.maxTableRow = Lignes (max.) -mydb.maxRowExplanation=(0 = toutes les lignes) +mydb.identifier = Login +mydb.password = Password +mydb.maxTableRow = Rows (max.) +mydb.maxRowExplanation = (0 = all lines) + mydb.description = Description mydb.mainTitle=My DB -mydb.criterionValue = valeur -mydb.all = Tous +mydb.criterionValue = Value +mydb.all = All -mydb.column = Colonne -mydb.criterion = Crit\u00e8re -mydb.include = Contient -mydb.dataSource=Source de donn\u00e9es -mydb.reload=Rafra\u00eechir -mydb.criterionValueExplanation=Taper <b>null</b> pour chercher les valeurs nulles.<br/>Taper <b>@empty@</b> pour chercher les valeurs vides.<br/>Utiliser <b>,</b> pour cr\u00e9er une liste de valeur (include). -mydb.error.noSelectedTable=Aucune de table s\u00e9lectionn\u00e9e. Veuillez en choisir une. -mydb.error.noSelectedColumn=Aucune colonne s\u00e9lectionn\u00e9e. Veuillez en choisir une. -mydb.error.noSelectedComparator=Aucun comparateur s\u00e9lectionn\u00e9. Veuillez en choisir un. -mydb.error.noValue=Aucune valeur indiqu\u00e9e. Veuillez en donner une. -mydb.deletion.confirmation=\u00cates vous s\u00fbr de vouloir supprimer cette ligne ? -mydb.modifyRow=Modifier la ligne -mydb.error.invalidRow=Ligne invalide -mydb.primaryKey=Cl\u00e9 primaire -mydb.insertRow=Ajouter une nouvelle ligne -mydb.error.invalidValue=Vous avez saisie une valeur invalide vis \u00e0 vis de son type -mydb.foreignKey=Cl\u00e9 \u00e9trang\u00e8re -mydb.error.nonExistingTable=La table demand\u00e9e n'existe pas -mydb.tables=Tables : -mydb.emptyInputExplanation=Champ vide = aucune valeur (null) -mydb.nullExplanation=Aucune valeur -mydb.emptyStringExplanation=Cha\u00eene de caract\u00e8res vide -mydb.error.mandatory=Le champs est obligatoire. Il ne peut \u00eatre nulle. -mydb.add.success=Les donn\u00e9es ont \u00e9t\u00e9 ajout\u00e9es -mydb.update.success=Les donn\u00e9es ont \u00e9t\u00e9 mises \u00e0 jour -mydb.update.none=Aucune mise \u00e0 jour, les donn\u00e9es ont peut-\u00eatre d\u00e9j\u00e0 \u00e9t\u00e9 modifi\u00e9es par un autre utilisateur -mydb.delete.success=Les donn\u00e9es ont \u00e9t\u00e9 supprim\u00e9es -mydb.delete.none=Aucune suppression, les donn\u00e9es ont peut-\u00eatre d\u00e9j\u00e0 \u00e9t\u00e9 supprim\u00e9es par un autre utilisateur -mydb.error.dataSource=La connexion avec la base de donn\u00e9es ne peut \u00eatre \u00e9tablie. Veuillez contacter l'administrateur pour lui informer du probl\u00e8me ou pour en savoir plus. \ No newline at end of file +mydb.column = Column +mydb.criterion=Criterion +mydb.include = contains +mydb.dataSource=Data Source +mydb.reload=Reload +mydb.error.invalidConnectionSettings=Invalid connection parameters +mydb.criterionValueExplanation=Fill <b>null</b> to search for null values.<br/>Fill <b>@empty@</b> to search for empty values.<br/>Use <b>,</b> to create a list of values (include). +mydb.error.noSelectedTable=No table selected. Please choose one. +mydb.error.noSelectedColumn=No column selected. Please choose one. +mydb.error.noSelectedComparator=No comparator selected. Please choose one. +mydb.error.noValue=No value set. Please set one. +mydb.deletion.confirmation=Are you sure to delete this line? +mydb.modifyRow=Update the row +mydb.error.invalidRow=Invalid row +mydb.primaryKey=Primary key +mydb.insertRow=Add a new row +mydb.error.invalidValue=Invalid value for the expected type +mydb.foreignKey=Foreign key +mydb.error.nonExistingTable=The asking table doesn't exist +mydb.tables=Tables: +mydb.emptyInputExplanation=Empty field = no value (null) +mydb.nullExplanation=No value +mydb.emptyStringExplanation=Empty string +mydb.error.mandatory=The field is mandatory. It cannot be null. +mydb.add.success=Data have been created +mydb.update.success=Data have been updated +mydb.update.none=No update, maybe data have already been updated by an other user +mydb.delete.success=Data have been deleted +mydb.delete.none=No update, maybe data have already been deleted by an other user +mydb.error.dataSource=The connexion with the database cannot opened. Please contact the administrator to let him know about the problem or to get more information. +mydb.error.technical=Click here to see the technical error +mydb.error.table.read=An error occurred while searching for data in the table +mydb.error.filter.criteria=An error has occurred, please check the search criteria entered diff --git a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_de.properties b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_de.properties index a4550d8819..01550d323a 100644 --- a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_de.properties +++ b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # mydb.error.invalidConnectionSettings = Verbindungsparameter falsch @@ -65,4 +65,7 @@ mydb.update.success=Data have been updated mydb.update.none=No update, maybe data have already been updated by an other user mydb.delete.success=Data have been deleted mydb.delete.none=No update, maybe data have already been deleted by an other user -mydb.error.dataSource=Die Verbindung mit der Datenbank kann nicht geöffnet werden. Wenden Sie sich an den Administrator, um ihn über das Problem zu informieren oder weitere Informationen zu erhalten. \ No newline at end of file +mydb.error.dataSource=Die Verbindung mit der Datenbank kann nicht ge\u00f6ffnet werden. Wenden Sie sich an den Administrator, um ihn \u00fcber das Problem zu informieren oder weitere Informationen zu erhalten. +mydb.error.technical=Click here to see the technical error +mydb.error.table.read=An error occurred while searching for data in the table +mydb.error.filter.criteria=An error has occurred, please check the search criteria entered diff --git a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_en.properties b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_en.properties deleted file mode 100644 index 052217b7d4..0000000000 --- a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_en.properties +++ /dev/null @@ -1,68 +0,0 @@ -# -# Copyright (C) 2000 - 2020 Silverpeas -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# As a special exception to the terms and conditions of version 3.0 of -# the GPL, you may redistribute this Program in connection with Free/Libre -# Open Source Software ("FLOSS") applications as described in Silverpeas's -# FLOSS exception. You should have recieved a copy of the text describing -# the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -mydb.error.tooLongValue = Too many characters -mydb.error.valueNotNumber = Integer field required -mydb.dataSourceSetting=Connection settings -mydb.tableView=Tables -mydb.identifier = Login -mydb.password = Password -mydb.maxTableRow = Rows (max.) -mydb.maxRowExplanation = (0 = all lines) - -mydb.description = Description - -mydb.mainTitle=My DB -mydb.criterionValue = Value -mydb.all = All - -mydb.column = Column -mydb.criterion=Criterion -mydb.include = contains -mydb.dataSource=Data Source -mydb.reload=Reload -mydb.error.invalidConnectionSettings=Invalid connection parameters -mydb.criterionValueExplanation=Fill <b>null</b> to search for null values.<br/>Fill <b>@empty@</b> to search for empty values.<br/>Use <b>,</b> to create a list of values (include). -mydb.error.noSelectedTable=No table selected. Please choose one. -mydb.error.noSelectedColumn=No column selected. Please choose one. -mydb.error.noSelectedComparator=No comparator selected. Please choose one. -mydb.error.noValue=No value set. Please set one. -mydb.deletion.confirmation=Are you sure to delete this line? -mydb.modifyRow=Update the row -mydb.error.invalidRow=Invalid row -mydb.primaryKey=Primary key -mydb.insertRow=Add a new row -mydb.error.invalidValue=Invalid value for the expected type -mydb.foreignKey=Foreign key -mydb.error.nonExistingTable=The asking table doesn't exist -mydb.tables=Tables: -mydb.emptyInputExplanation=Empty field = no value (null) -mydb.nullExplanation=No value -mydb.emptyStringExplanation=Empty string -mydb.error.mandatory=The field is mandatory. It cannot be null. -mydb.add.success=Data have been created -mydb.update.success=Data have been updated -mydb.update.none=No update, maybe data have already been updated by an other user -mydb.delete.success=Data have been deleted -mydb.delete.none=No update, maybe data have already been deleted by an other user -mydb.error.dataSource=The connexion with the database cannot opened. Please contact the administrator to let him know about the problem or to get more information. \ No newline at end of file diff --git a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_fr.properties b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_fr.properties index 8804baa18b..3c50e465fe 100644 --- a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_fr.properties +++ b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/multilang/mydb_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # mydb.error.invalidConnectionSettings = param\u00e8tres de connexion incorrects mydb.error.tooLongValue = champ trop long @@ -42,7 +42,7 @@ mydb.include = Contient mydb.dataSource=Source de donn\u00e9es mydb.reload=Rafra\u00eechir mydb.criterionValueExplanation=Taper <b>null</b> pour chercher les valeurs nulles.<br/>Taper <b>@empty@</b> pour chercher les valeurs vides.<br/>Utiliser <b>,</b> pour cr\u00e9er une liste de valeur (include). -mydb.error.noSelectedTable=Aucune de table s\u00e9lectionn\u00e9e. Veuillez en choisir une. +mydb.error.noSelectedTable=Aucune table s\u00e9lectionn\u00e9e. Veuillez en choisir une. mydb.error.noSelectedColumn=Aucune colonne s\u00e9lectionn\u00e9e. Veuillez en choisir une. mydb.error.noSelectedComparator=Aucun comparateur s\u00e9lectionn\u00e9. Veuillez en choisir un. mydb.error.noValue=Aucune valeur indiqu\u00e9e. Veuillez en donner une. @@ -64,4 +64,7 @@ mydb.update.success = Les donn\u00e9es ont \u00e9t\u00e9 mises \u00e0 jour mydb.update.none = Aucune mise \u00e0 jour, les donn\u00e9es ont peut-\u00eatre d\u00e9j\u00e0 \u00e9t\u00e9 modifi\u00e9es par un autre utilisateur mydb.delete.success = Les donn\u00e9es ont \u00e9t\u00e9 supprim\u00e9es mydb.delete.none = Aucune suppression, les donn\u00e9es ont peut-\u00eatre d\u00e9j\u00e0 \u00e9t\u00e9 supprim\u00e9es par un autre utilisateur -mydb.error.dataSource=La connexion avec la base de donn\u00e9es ne peut \u00eatre \u00e9tablie. Veuillez contacter l'administrateur pour lui informer du probl\u00e8me ou pour en savoir plus. \ No newline at end of file +mydb.error.dataSource=La connexion avec la base de donn\u00e9es ne peut \u00eatre \u00e9tablie. Veuillez contacter l'administrateur pour lui informer du probl\u00e8me ou pour en savoir plus. +mydb.error.technical=Cliquez ici pour voir l'erreur technique +mydb.error.table.read=Une erreur est survenue lors de la recherche des donn\u00e9es dans la table +mydb.error.filter.criteria=Une erreur s'est produite, veuillez v\u00e9rifier les crit\u00e8res de recherche renseign\u00e9s diff --git a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/settings/dataSources.properties b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/settings/dataSources.properties index d30ccf3711..03467c01b4 100644 --- a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/settings/dataSources.properties +++ b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/settings/dataSources.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify it under the terms of the # GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ # redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") # applications as described in Silverpeas's FLOSS exception. You should have received a copy of the # text describing the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License along with this program. -# If not, see <http://www.gnu.org/licenses/>. +# If not, see <https://www.gnu.org/licenses/>. # # number of configured data sources diff --git a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/settings/mydbIcons.properties b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/settings/mydbIcons.properties index 242548b4fd..40fa5a54d7 100644 --- a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/settings/mydbIcons.properties +++ b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/mydb/settings/mydbIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # mydb.icons.addRecord = /util/icons/create-action/add-champ.png mydb.icons.updateLine = /util/icons/update.gif diff --git a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/util/logging/myDBLogging.properties b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/util/logging/myDBLogging.properties index 52754cb5b3..596553f848 100644 --- a/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/util/logging/myDBLogging.properties +++ b/mydb/mydb-configuration/src/main/config/properties/org/silverpeas/util/logging/myDBLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/mydb/mydb-configuration/src/main/config/xmlcomponents/myDB.xml b/mydb/mydb-configuration/src/main/config/xmlcomponents/myDB.xml index ae5b8621a4..eb47024365 100644 --- a/mydb/mydb-configuration/src/main/config/xmlcomponents/myDB.xml +++ b/mydb/mydb-configuration/src/main/config/xmlcomponents/myDB.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/mydb/mydb-library/pom.xml b/mydb/mydb-library/pom.xml index 4a291b3d5a..69575e9f08 100644 --- a/mydb/mydb-library/pom.xml +++ b/mydb/mydb-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>mydb</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.mydb</groupId> diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/MyDBInstancePreDestruction.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/MyDBInstancePreDestruction.java index 8d045cae4f..97bd4a59c7 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/MyDBInstancePreDestruction.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/MyDBInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DataSourceDefinition.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DataSourceDefinition.java index 3fbb05bf89..29299b3bcb 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DataSourceDefinition.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DataSourceDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DbColumn.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DbColumn.java index 291406a8a0..df92fcfcd9 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DbColumn.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DbColumn.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DbTable.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DbTable.java index 379ec19d06..a63d7e0799 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DbTable.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/DbTable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model; @@ -37,8 +37,11 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.function.Predicate; import java.util.stream.Collectors; +import static java.util.stream.Collectors.toMap; + /** * Table loaded from the database referred by a {@link MyDBConnectionInfo} instance. * @author mmoquillon @@ -220,7 +223,7 @@ private Map<String, Object> getCriteriaFrom(final TableRow row) { final Map<String, Object> criteria; if (!pkColumns.isEmpty()) { criteria = pkColumns.stream() - .collect(Collectors.toMap(DbColumn::getName, + .collect(toMap(DbColumn::getName, pk -> row.getFieldValue(pk.getName()).toSQLObject())); } else { criteria = tableRowToMap(row); @@ -229,9 +232,10 @@ private Map<String, Object> getCriteriaFrom(final TableRow row) { } private Map<String, Object> tableRowToMap(final TableRow tableRow) { - final Map<String, Object> rows = new HashMap<>(); - tableRow.getFields().forEach((key, value) -> rows.put(key, value.toSQLObject())); - return rows; + return tableRow.getFields() + .entrySet() + .stream() + .filter(Predicate.not(e -> e.getKey().equalsIgnoreCase("SP_MAX_ROW_COUNT"))) + .collect(HashMap::new, (h, e) -> h.put(e.getKey(), e.getValue().toSQLObject()), HashMap::putAll); } } - \ No newline at end of file diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/JdbcRequester.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/JdbcRequester.java index 1513d7f008..0ce35bdf9d 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/JdbcRequester.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/JdbcRequester.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/MyDBConnectionInfo.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/MyDBConnectionInfo.java index a93c76db39..0f070538d8 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/MyDBConnectionInfo.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/MyDBConnectionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/MyDBConnectionInfoRepository.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/MyDBConnectionInfoRepository.java index e68d847e45..0045baa94c 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/MyDBConnectionInfoRepository.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/MyDBConnectionInfoRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/SqlTypes.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/SqlTypes.java index 9667edb810..17ca0fc265 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/SqlTypes.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/SqlTypes.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/TableFieldValue.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/TableFieldValue.java index c44852290b..67376b6c48 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/TableFieldValue.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/TableFieldValue.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/TableRow.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/TableRow.java index 67b9ab4cca..5511bf65fe 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/TableRow.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/TableRow.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/AbstractColumnValuePredicate.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/AbstractColumnValuePredicate.java index fcb87821df..72052c6a05 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/AbstractColumnValuePredicate.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/AbstractColumnValuePredicate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/ColumnValuePredicate.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/ColumnValuePredicate.java index a3b1551882..0ef52d9222 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/ColumnValuePredicate.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/ColumnValuePredicate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Equality.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Equality.java index 34331e5590..f13965f35f 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Equality.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Equality.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Identity.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Identity.java index b81b3efc4e..bf038846e0 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Identity.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Identity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inclusion.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inclusion.java index bbe395d2c5..2d9f78afbb 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inclusion.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inclusion.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inequality.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inequality.java index 5a38c87702..cf02e71918 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inequality.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inequality.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inferiority.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inferiority.java index 2045ddd8c4..845279ad20 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inferiority.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Inferiority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Like.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Like.java index c62d0fd60a..77b4edc4c2 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Like.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Like.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,14 +19,17 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; import org.silverpeas.components.mydb.model.DbColumn; +import org.silverpeas.components.mydb.service.MyDBRuntimeException; import org.silverpeas.core.persistence.jdbc.sql.JdbcSqlQuery; +import static java.text.MessageFormat.format; + /** * The like predicate. * @author silveryocha @@ -45,7 +48,14 @@ public Like(final DbColumn column, final String refValue) { @Override public JdbcSqlQuery apply(final JdbcSqlQuery query) { - return query.where("lower(" + getColumn().getName() + ") like lower(?)", getNormalizedValue()); + final Object normalizedValue = getNormalizedValue(); + if (getColumn().isOfTypeText()) { + return query.where("lower(" + getColumn().getName() + ") like lower(?)", normalizedValue); + } else { + throw new MyDBRuntimeException(format( + "Operator ''like'' cannot be applied to column ''{0}'' of type ''{1}'' with value " + + "''{2}''.\n\nPlease trying with a column of text type", + getColumn().getName(), getColumn().getTypeName(), normalizedValue)); + } } } - \ No newline at end of file diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/StrictInferiority.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/StrictInferiority.java index ecdc2c6719..3ae47eb958 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/StrictInferiority.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/StrictInferiority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/StrictSuperiority.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/StrictSuperiority.java index 1ebac09848..4ca0882cc5 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/StrictSuperiority.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/StrictSuperiority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Superiority.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Superiority.java index 859abc0c59..8e12e7c3bd 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Superiority.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/model/predicates/Superiority.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model.predicates; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBConnectionInfoService.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBConnectionInfoService.java index ecc48baaea..74fd98e5f9 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBConnectionInfoService.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBConnectionInfoService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.service; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBException.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBException.java index e06390691a..f8fe0632c9 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBException.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.service; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBRuntimeException.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBRuntimeException.java index 858f300b1a..de6f22bca7 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBRuntimeException.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/MyDBRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.service; diff --git a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/impl/SimpleMyDBConnectionInfoService.java b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/impl/SimpleMyDBConnectionInfoService.java index 92f534c0ca..a3753d3fd8 100644 --- a/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/impl/SimpleMyDBConnectionInfoService.java +++ b/mydb/mydb-library/src/main/java/org/silverpeas/components/mydb/service/impl/SimpleMyDBConnectionInfoService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.service.impl; diff --git a/mydb/mydb-library/src/test/java/org/silverpeas/components/mydb/model/DbColumnTest.java b/mydb/mydb-library/src/test/java/org/silverpeas/components/mydb/model/DbColumnTest.java index a13f84617a..0eacf4fa14 100644 --- a/mydb/mydb-library/src/test/java/org/silverpeas/components/mydb/model/DbColumnTest.java +++ b/mydb/mydb-library/src/test/java/org/silverpeas/components/mydb/model/DbColumnTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.model; diff --git a/mydb/mydb-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer b/mydb/mydb-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer index 9785bab5e6..02b5b225ce 100644 --- a/mydb/mydb-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer +++ b/mydb/mydb-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # org.silverpeas.core.test.TestBeanContainer \ No newline at end of file diff --git a/mydb/mydb-war/pom.xml b/mydb/mydb-war/pom.xml index 7c9dd5e0dd..d8dfb08ae5 100644 --- a/mydb/mydb-war/pom.xml +++ b/mydb/mydb-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>mydb</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.mydb</groupId> diff --git a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBMessageManager.java b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBMessageManager.java new file mode 100644 index 0000000000..04ce209240 --- /dev/null +++ b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBMessageManager.java @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2000 - 2024 Silverpeas + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * As a special exception to the terms and conditions of version 3.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * Open Source Software ("FLOSS") applications as described in Silverpeas's + * FLOSS exception. You should have received a copy of the text describing + * the FLOSS exception, and it is also available here: + * "https://www.silverpeas.org/legal/floss_exception.html" + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +package org.silverpeas.components.mydb.web; + +import org.silverpeas.core.cache.service.CacheServiceProvider; +import org.silverpeas.core.util.Pair; + +import static org.silverpeas.core.util.StringUtil.EMPTY; +import static org.silverpeas.core.util.StringUtil.isDefined; + +/** + * This class permits to handle messages into context of MyDB component. + * <p> + * It is particularly useful for UI error management. + * </p> + * @author silveryocha + */ +public class MyDBMessageManager { + + private Pair<String, String> error = null; + + public static MyDBMessageManager get() { + final Class<MyDBMessageManager> ownClass = MyDBMessageManager.class; + return CacheServiceProvider.getRequestCacheService() + .getCache() + .computeIfAbsent(ownClass.getName(), ownClass, MyDBMessageManager::new); + } + + private MyDBMessageManager() { + // internal initialization + } + + public boolean isError() { + return error != null && isDefined(error.getFirst()); + } + + public Pair<String, String> getError() { + return error; + } + + public void setError(final String functionalError) { + this.error = Pair.of(functionalError, EMPTY); + } + + public void setError(final String functionalError, final Exception e) { + if (e == null) { + setError(functionalError); + } else { + this.error = Pair.of(functionalError, e.getLocalizedMessage()); + } + } +} diff --git a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBWebController.java b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBWebController.java index c4872339b3..b657c76bad 100644 --- a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBWebController.java +++ b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBWebController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.web; @@ -103,7 +103,7 @@ public class MyDBWebController private static final String ERROR_INVALID_ROW_KEY = "mydb.error.invalidRow"; private MyDBConnectionInfo connectionInfo; - private transient TableView tableView = new TableView(); + private transient TableView tableView; private String mainArrayPaneName; /** @@ -119,6 +119,7 @@ public MyDBWebController(final MainSessionController controller, final Component @Override protected void onInstantiation(final MyDBWebRequestContext context) { + tableView = new TableView(getMultilang()); final String instanceId = context.getComponentInstanceId(); mainArrayPaneName = "Table" + instanceId; final List<MyDBConnectionInfo> availableConnectionInfo = @@ -179,7 +180,7 @@ public void viewTableContent(final MyDBWebRequestContext context) { tableView.setOrderBy(getOrderByFrom(request, tableView.getOrderBies(), getSessionTableViewId())); setUpRequestAttributes(request); } catch (MyDBRuntimeException e) { - context.getMessager().addError(e.getLocalizedMessage()); + context.getMyDBMessageManager().setError(getString("mydb.error.table.read"), e); } } @@ -233,7 +234,7 @@ public void getForeignKeyTableViewFrom(final MyDBWebRequestContext context) { final Map<String, String> fields = parseForeignKeyRow(selectedRow); final Optional<DbTable> targetTable = DbTable.table(targetTableName, connectionInfo); if (targetTable.isPresent()) { - final TableView targetTableView = new TableView(); + final TableView targetTableView = new TableView(getMultilang()); targetTableView.setTable(targetTable); final HttpRequest request = context.getRequest(); final String fkArrayPaneName = "FkTable@" + targetTableName; @@ -488,8 +489,8 @@ private boolean connectionInfoIsValid(final MyDBWebRequestContext context) { connectionInfo.checkConnection(); return true; } catch (MyDBException e) { + context.getMyDBMessageManager().setError(getString("mydb.error.invalidConnectionSettings")); SilverLogger.getLogger(this).error(e); - context.getMessager().addError(getString("mydb.error.invalidConnectionSettings")); return false; } } diff --git a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBWebRequestContext.java b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBWebRequestContext.java index 425fc52984..80b21cb11a 100644 --- a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBWebRequestContext.java +++ b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/MyDBWebRequestContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.web; @@ -33,5 +33,8 @@ */ public class MyDBWebRequestContext extends WebComponentRequestContext<MyDBWebController> { + + public MyDBMessageManager getMyDBMessageManager() { + return MyDBMessageManager.get(); + } } - \ No newline at end of file diff --git a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableRowUIEntity.java b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableRowUIEntity.java index 375653245e..c4058ba01e 100644 --- a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableRowUIEntity.java +++ b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableRowUIEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.web; diff --git a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableRowsFilter.java b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableRowsFilter.java index eea9b2ceb9..bdba1946a7 100644 --- a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableRowsFilter.java +++ b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableRowsFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.web; diff --git a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableView.java b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableView.java index a8f314b8c2..6e5cd66cb7 100644 --- a/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableView.java +++ b/mydb/mydb-war/src/main/java/org/silverpeas/components/mydb/web/TableView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.mydb.web; @@ -30,11 +30,11 @@ import org.silverpeas.components.mydb.model.TableRow; import org.silverpeas.components.mydb.service.MyDBRuntimeException; import org.silverpeas.core.admin.PaginationPage; +import org.silverpeas.core.util.LocalizationBundle; import org.silverpeas.core.util.Mutable; import org.silverpeas.core.util.SilverpeasArrayList; import org.silverpeas.core.util.SilverpeasList; import org.silverpeas.core.util.logging.SilverLogger; -import org.silverpeas.core.web.mvc.webcomponent.WebMessager; import java.util.ArrayList; import java.util.HashMap; @@ -56,6 +56,7 @@ */ public class TableView { + private final LocalizationBundle message; private final Map<Integer, Pair<String, String>> orderBies = new HashMap<>(50); private Optional<DbTable> table = Optional.empty(); private TableRowsFilter filter = new TableRowsFilter(); @@ -65,8 +66,10 @@ public class TableView { /** * Constructs an empty table view. This view is on nothing. + * @param message */ - TableView() { + TableView(final LocalizationBundle message) { + this.message = message; } public PaginationPage getPagination() { @@ -168,7 +171,7 @@ public SilverpeasList<TableRowUIEntity> getRows() { try { table.ifPresent(t -> rows.set(applyFilter(t))); } catch (final MyDBRuntimeException e) { - WebMessager.getInstance().addSevere(e.getMessage()); + MyDBMessageManager.get().setError(message.getString("mydb.error.filter.criteria"), e); SilverLogger.getLogger(this).error(e); } lastRows = convertList(this, rows.orElseGet(SilverpeasArrayList::new), emptySet()); diff --git a/mydb/mydb-war/src/main/webapp/WEB-INF/tags/silverpeas/mydb/messages.tag b/mydb/mydb-war/src/main/webapp/WEB-INF/tags/silverpeas/mydb/messages.tag new file mode 100644 index 0000000000..966de8997f --- /dev/null +++ b/mydb/mydb-war/src/main/webapp/WEB-INF/tags/silverpeas/mydb/messages.tag @@ -0,0 +1,57 @@ +<%-- + Copyright (C) 2000 - 2024 Silverpeas + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + As a special exception to the terms and conditions of version 3.0 of + the GPL, you may redistribute this Program in connection with Free/Libre + Open Source Software ("FLOSS") applications as described in Silverpeas's + FLOSS exception. You should have recieved a copy of the text describing + the FLOSS exception, and it is also available here: + "https://www.silverpeas.org/legal/floss_exception.html" + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + --%> + +<%@ tag language="java" pageEncoding="UTF-8" %> +<%@ tag import="org.silverpeas.components.mydb.web.MyDBMessageManager" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib uri="http://www.silverpeas.com/tld/silverFunctions" prefix="silfn" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view" %> + +<c:set var="userLanguage" value="${requestScope.resources.language}"/> +<fmt:setLocale value="${userLanguage}"/> +<view:setBundle bundle="${requestScope.resources.multilangBundle}"/> + +<fmt:message var="technicalErrorLabel" key="mydb.error.technical"/> + +<c:set var="messageManager" value="<%=MyDBMessageManager.get()%>"/> +<c:set var="isError" value="${messageManager.isError()}"/> + +<c:if test="${isError}"> + <div id="error" class="MessageReadHighPriority"> + <span>${messageManager.getError().getFirst()}</span> + <c:set var="technicalError" value="${messageManager.getError().getSecond()}"/> + <c:if test="${not empty technicalError}"> + <script type="text/javascript"> + function showTechnicalError() { + SilverpeasError.add('${silfn:escapeJs(technicalError)}').show(); + } + </script> + <div id="technicalError"> + <a href="javascript:void(0)" onclick="showTechnicalError()">${technicalErrorLabel}</a> + </div> + </c:if> + </div> +</c:if> diff --git a/mydb/mydb-war/src/main/webapp/WEB-INF/web.xml b/mydb/mydb-war/src/main/webapp/WEB-INF/web.xml index 4d9a1bf968..b748eb57a5 100644 --- a/mydb/mydb-war/src/main/webapp/WEB-INF/web.xml +++ b/mydb/mydb-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/mydb/mydb-war/src/main/webapp/myDB/jsp/connectionSettings.jsp b/mydb/mydb-war/src/main/webapp/myDB/jsp/connectionSettings.jsp index 65e6ef181b..0294b5f14a 100644 --- a/mydb/mydb-war/src/main/webapp/myDB/jsp/connectionSettings.jsp +++ b/mydb/mydb-war/src/main/webapp/myDB/jsp/connectionSettings.jsp @@ -1,12 +1,5 @@ -<%@ include file="head.jsp" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@ taglib uri="http://www.silverpeas.com/tld/silverFunctions" prefix="silfn" %> -<%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view" %> - <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -26,9 +19,17 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> +<%@ include file="head.jsp" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib uri="http://www.silverpeas.com/tld/silverFunctions" prefix="silfn" %> +<%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view" %> +<%@ taglib tagdir="/WEB-INF/tags/silverpeas/mydb" prefix="mydbTags" %> + <c:set var="currentUserLanguage" value="${sessionScope['SilverSessionController'].favoriteLanguage}"/> <fmt:setLocale value="${currentUserLanguage}"/> <view:setBundle bundle="${requestScope.resources.multilangBundle}"/> @@ -134,6 +135,7 @@ <view:tab label="${settings}" action="ConnectionSetting" selected="true"/> </view:tabs> <view:frame> + <mydbTags:messages/> <form id="processForm" name="processForm" action="UpdateConnection" method="post"> <fieldset class="skinFieldset"> <legend></legend> diff --git a/mydb/mydb-war/src/main/webapp/myDB/jsp/error.jsp b/mydb/mydb-war/src/main/webapp/myDB/jsp/error.jsp index 3a179e1a74..dd0d2b4a4f 100644 --- a/mydb/mydb-war/src/main/webapp/myDB/jsp/error.jsp +++ b/mydb/mydb-war/src/main/webapp/myDB/jsp/error.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="head.jsp" %> diff --git a/mydb/mydb-war/src/main/webapp/myDB/jsp/fkTable.jsp b/mydb/mydb-war/src/main/webapp/myDB/jsp/fkTable.jsp index fcc691f5fa..682b7540fd 100644 --- a/mydb/mydb-war/src/main/webapp/myDB/jsp/fkTable.jsp +++ b/mydb/mydb-war/src/main/webapp/myDB/jsp/fkTable.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="head.jsp" %> diff --git a/mydb/mydb-war/src/main/webapp/myDB/jsp/head.jsp b/mydb/mydb-war/src/main/webapp/myDB/jsp/head.jsp index db9f850e90..3d2f90ccc2 100644 --- a/mydb/mydb-war/src/main/webapp/myDB/jsp/head.jsp +++ b/mydb/mydb-war/src/main/webapp/myDB/jsp/head.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <% diff --git a/mydb/mydb-war/src/main/webapp/myDB/jsp/mydb.jsp b/mydb/mydb-war/src/main/webapp/myDB/jsp/mydb.jsp index 209ae4a7a0..b74f8f81e4 100644 --- a/mydb/mydb-war/src/main/webapp/myDB/jsp/mydb.jsp +++ b/mydb/mydb-war/src/main/webapp/myDB/jsp/mydb.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="head.jsp" %> @@ -28,6 +28,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib uri="http://www.silverpeas.com/tld/silverFunctions" prefix="silfn" %> <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view" %> +<%@ taglib tagdir="/WEB-INF/tags/silverpeas/mydb" prefix="mydbTags" %> <c:set var="currentUserLanguage" value="${sessionScope['SilverSessionController'].favoriteLanguage}"/> <fmt:setLocale value="${currentUserLanguage}"/> @@ -354,6 +355,7 @@ </c:if> <view:frame> <view:areaOfOperationOfCreation/> + <mydbTags:messages/> <c:if test="${currentUserCanManageRows}"> <div id="selection" style="padding-bottom: 10px"> <label for="table"><fmt:message key="mydb.tables"/></label> @@ -467,4 +469,4 @@ </view:frame> </view:window> <view:progressMessage/> -</body> \ No newline at end of file +</body> diff --git a/mydb/mydb-war/src/main/webapp/myDB/jsp/rowForm.jsp b/mydb/mydb-war/src/main/webapp/myDB/jsp/rowForm.jsp index 2ff6df8c6b..ee92416bac 100644 --- a/mydb/mydb-war/src/main/webapp/myDB/jsp/rowForm.jsp +++ b/mydb/mydb-war/src/main/webapp/myDB/jsp/rowForm.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="head.jsp" %> diff --git a/mydb/mydb-war/src/main/webapp/myDB/jsp/styleSheets/myDB.css b/mydb/mydb-war/src/main/webapp/myDB/jsp/styleSheets/myDB.css index 045f5ff058..b80f07fa4b 100644 --- a/mydb/mydb-war/src/main/webapp/myDB/jsp/styleSheets/myDB.css +++ b/mydb/mydb-war/src/main/webapp/myDB/jsp/styleSheets/myDB.css @@ -31,4 +31,8 @@ #selection .selectNS { display: table-cell; vertical-align: middle; -} \ No newline at end of file +} + +#technicalError a { + font-size: 0.80em; +} diff --git a/mydb/pom.xml b/mydb/pom.xml index 65a2876a13..9378d7269a 100644 --- a/mydb/pom.xml +++ b/mydb/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/organizationchart/organizationchart-configuration/pom.xml b/organizationchart/organizationchart-configuration/pom.xml index 4607713501..b6019dd101 100644 --- a/organizationchart/organizationchart-configuration/pom.xml +++ b/organizationchart/organizationchart-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>organizationchart</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.organizationchart</groupId> diff --git a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle.properties b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle.properties index 8285f08396..e36f7bd27d 100644 --- a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle.properties +++ b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # organizationchart.explications = Si aucune nouvelle fen�tre n'est apparue, cliquez organizationchart.ici = ici diff --git a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_de.properties b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_de.properties index a8499a48a9..1fdbfdfb54 100644 --- a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_de.properties +++ b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # organizationchart.explications = Wenn kein neues Fenster erschienen ist, klicken Sie organizationchart.ici = hier diff --git a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_en.properties b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_en.properties index 77de55bb0a..284f32f68c 100644 --- a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_en.properties +++ b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # organizationchart.explications = If no new window appears, click organizationchart.ici = here diff --git a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_fr.properties b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_fr.properties index 8285f08396..e36f7bd27d 100644 --- a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_fr.properties +++ b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/multilang/OrganizationChartBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # organizationchart.explications = Si aucune nouvelle fen�tre n'est apparue, cliquez organizationchart.ici = ici diff --git a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/settings/OrganizationChartIcons.properties b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/settings/OrganizationChartIcons.properties index d8ac43b1fb..730324d81d 100644 --- a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/settings/OrganizationChartIcons.properties +++ b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/settings/OrganizationChartIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # organizationchart.icons.users = /silverpeas/organizationchart/img/users.gif organizationchart.icons.print = \ No newline at end of file diff --git a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/settings/OrganizationChartSettings.properties b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/settings/OrganizationChartSettings.properties index a05d1cba26..1b307f1822 100644 --- a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/settings/OrganizationChartSettings.properties +++ b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/components/organizationchart/settings/OrganizationChartSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,6 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # sort.units.name = false \ No newline at end of file diff --git a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/util/logging/organizationchartLogging.properties b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/util/logging/organizationchartLogging.properties index 8baa66eac7..915996464e 100644 --- a/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/util/logging/organizationchartLogging.properties +++ b/organizationchart/organizationchart-configuration/src/main/config/properties/org/silverpeas/util/logging/organizationchartLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/organizationchart/organizationchart-configuration/src/main/config/xmlcomponents/organizationchart.xml b/organizationchart/organizationchart-configuration/src/main/config/xmlcomponents/organizationchart.xml index 89f9d6cdf7..50f419441f 100644 --- a/organizationchart/organizationchart-configuration/src/main/config/xmlcomponents/organizationchart.xml +++ b/organizationchart/organizationchart-configuration/src/main/config/xmlcomponents/organizationchart.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/organizationchart/organizationchart-configuration/src/main/config/xmlcomponents/orgchartGroup.xml b/organizationchart/organizationchart-configuration/src/main/config/xmlcomponents/orgchartGroup.xml index 1399b69639..a795edd08f 100644 --- a/organizationchart/organizationchart-configuration/src/main/config/xmlcomponents/orgchartGroup.xml +++ b/organizationchart/organizationchart-configuration/src/main/config/xmlcomponents/orgchartGroup.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/organizationchart/organizationchart-library/pom.xml b/organizationchart/organizationchart-library/pom.xml index 68e50711c9..adbe0e6e88 100644 --- a/organizationchart/organizationchart-library/pom.xml +++ b/organizationchart/organizationchart-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>organizationchart</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.organizationchart</groupId> diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalChart.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalChart.java index 3d3b3f7dc3..2ba99c3ad0 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalChart.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalChart.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.model; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalChartType.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalChartType.java index 4875aa4fb4..8f892eb63b 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalChartType.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalChartType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.model; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalPerson.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalPerson.java index 3901db94d9..09e1402909 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalPerson.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalPerson.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.model; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalPersonComparator.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalPersonComparator.java index 3fa82d2bd1..04d93479de 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalPersonComparator.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalPersonComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.model; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalRole.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalRole.java index a9639ada0d..76202704ec 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalRole.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalRole.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.model; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalUnit.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalUnit.java index dfc62ecfc8..5921f167f3 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalUnit.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/OrganizationalUnit.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.model; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/PersonCategory.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/PersonCategory.java index 443d17933d..ed01fa4a9c 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/PersonCategory.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/model/PersonCategory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.model; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/AbstractOrganizationChartBuilder.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/AbstractOrganizationChartBuilder.java index 41eaf6690e..64b6b53169 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/AbstractOrganizationChartBuilder.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/AbstractOrganizationChartBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.service; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/AbstractOrganizationChartConfiguration.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/AbstractOrganizationChartConfiguration.java index ce194ff84e..b5435c0edd 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/AbstractOrganizationChartConfiguration.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/AbstractOrganizationChartConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.service; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/GroupOrganizationChartBuilder.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/GroupOrganizationChartBuilder.java index 8ba7391010..b26c4e458b 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/GroupOrganizationChartBuilder.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/GroupOrganizationChartBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.service; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/GroupOrganizationChartConfiguration.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/GroupOrganizationChartConfiguration.java index 39b9b5b3dc..18caa8057d 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/GroupOrganizationChartConfiguration.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/GroupOrganizationChartConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.service; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/LdapOrganizationChartBuilder.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/LdapOrganizationChartBuilder.java index 9e567b45de..14918044a2 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/LdapOrganizationChartBuilder.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/LdapOrganizationChartBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.service; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/LdapOrganizationChartConfiguration.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/LdapOrganizationChartConfiguration.java index 5f6e997231..34af94277b 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/LdapOrganizationChartConfiguration.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/LdapOrganizationChartConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.service; diff --git a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/OrganizationChartService.java b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/OrganizationChartService.java index 2409b87f93..b36a419c09 100644 --- a/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/OrganizationChartService.java +++ b/organizationchart/organizationchart-library/src/main/java/org/silverpeas/components/organizationchart/service/OrganizationChartService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.service; diff --git a/organizationchart/organizationchart-library/src/test/java/org/silverpeas/components/organizationchart/stub/StubbedOrganizationChartBuilder.java b/organizationchart/organizationchart-library/src/test/java/org/silverpeas/components/organizationchart/stub/StubbedOrganizationChartBuilder.java index a35bd666a2..ffbd24554b 100644 --- a/organizationchart/organizationchart-library/src/test/java/org/silverpeas/components/organizationchart/stub/StubbedOrganizationChartBuilder.java +++ b/organizationchart/organizationchart-library/src/test/java/org/silverpeas/components/organizationchart/stub/StubbedOrganizationChartBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.stub; diff --git a/organizationchart/organizationchart-war/pom.xml b/organizationchart/organizationchart-war/pom.xml index 0758743f54..f37ea8baa8 100644 --- a/organizationchart/organizationchart-war/pom.xml +++ b/organizationchart/organizationchart-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>organizationchart</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.organizationchart</groupId> diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/OrganizationChartIndexer.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/OrganizationChartIndexer.java index 6f0f586bec..b786520454 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/OrganizationChartIndexer.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/OrganizationChartIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart; diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/control/OrganizationChartSessionController.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/control/OrganizationChartSessionController.java index 0341b0c6f8..ecfaaf45c5 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/control/OrganizationChartSessionController.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/control/OrganizationChartSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.control; diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/control/UnitComparator.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/control/UnitComparator.java index 8112b9f9a0..b3525e31d6 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/control/UnitComparator.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/control/UnitComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.control; diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/servlets/OrganizationChartProcessor.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/servlets/OrganizationChartProcessor.java index 6b513b5e37..18c7876e4b 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/servlets/OrganizationChartProcessor.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/servlets/OrganizationChartProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.servlets; diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/servlets/OrganizationChartRequestRouter.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/servlets/OrganizationChartRequestRouter.java index 480362918f..ce3cc05e24 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/servlets/OrganizationChartRequestRouter.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/servlets/OrganizationChartRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.servlets; diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/CategoryBox.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/CategoryBox.java index 32e4f3d6a1..e8af75e403 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/CategoryBox.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/CategoryBox.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.view; diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartPersonnVO.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartPersonnVO.java index 8532bc41ae..f425f46801 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartPersonnVO.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartPersonnVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.view; diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartUnitVO.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartUnitVO.java index 1548c85034..5100eb1e02 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartUnitVO.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartUnitVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.view; diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartVO.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartVO.java index bbc1c8de2a..b6d6a24c99 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartVO.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/ChartVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.view; diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/OrganizationBox.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/OrganizationBox.java index 76df707b93..f3bf6de4ab 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/OrganizationBox.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/OrganizationBox.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.view; diff --git a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/UserVO.java b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/UserVO.java index 5ec8b093cb..42369c7614 100644 --- a/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/UserVO.java +++ b/organizationchart/organizationchart-war/src/main/java/org/silverpeas/components/organizationchart/view/UserVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.organizationchart.view; diff --git a/organizationchart/organizationchart-war/src/main/webapp/WEB-INF/web.xml b/organizationchart/organizationchart-war/src/main/webapp/WEB-INF/web.xml index f989799005..84ef20ac91 100644 --- a/organizationchart/organizationchart-war/src/main/webapp/WEB-INF/web.xml +++ b/organizationchart/organizationchart-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/css/organizationchart.css b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/css/organizationchart.css index f3e35396be..2d5d986069 100644 --- a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/css/organizationchart.css +++ b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/css/organizationchart.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ #chart {overflow: visible;} diff --git a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/js/organizationchart.js b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/js/organizationchart.js index f82fa901a6..815c44f7bb 100644 --- a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/js/organizationchart.js +++ b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/js/organizationchart.js @@ -473,18 +473,17 @@ function placeCells() } leftGap = mainDiv.offsetLeft; - for (j = 0; j < jLevels[i].length; j++) - { - if (j > 0) - { + var levelMaxHeight = 0; + for (j = 0; j < jLevels[i].length; j++) { + if (j > 0) { jLevels[i][j].leftCell = jLevels[i][j - 1]; } - if (j < (jLevels[i].length - 1)) - { + if (j < (jLevels[i].length - 1)) { jLevels[i][j].rightCell = jLevels[i][j + 1]; } div = jLevels[i][j].div; + if ( (jLevels[i][j].className==3) || (jLevels[i][j].className==4) ) { var x = topGap - H_GAP_SIDEBOX; div.style.top = x + "px"; @@ -492,10 +491,14 @@ function placeCells() div.style.top = topGap + "px"; } + if (div != null && div.offsetHeight > levelMaxHeight) { + levelMaxHeight = div.offsetHeight; + } + div.style.left = leftGap + "px"; } - topGap += V_GAP + (div != null ? div.offsetHeight : 0); + topGap += V_GAP + levelMaxHeight; } //resizeBoxes(jLevels); diff --git a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chart.jsp b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chart.jsp index cd77c0fa97..56f766fc8d 100644 --- a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chart.jsp +++ b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chart.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chartPersonns.jsp b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chartPersonns.jsp index 7e449cd95d..00529880d1 100644 --- a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chartPersonns.jsp +++ b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chartPersonns.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chartUnit.jsp b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chartUnit.jsp index bae52c3b00..7e9a831482 100644 --- a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chartUnit.jsp +++ b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/chartUnit.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/check.jsp b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/check.jsp index f55345e9ee..40c064388c 100644 --- a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/check.jsp +++ b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/person.jsp b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/person.jsp index ddc4750c5b..08804482af 100644 --- a/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/person.jsp +++ b/organizationchart/organizationchart-war/src/main/webapp/organizationchart/jsp/person.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/organizationchart/pom.xml b/organizationchart/pom.xml index fba50933b1..9a4a006483 100644 --- a/organizationchart/pom.xml +++ b/organizationchart/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/pom.xml b/pom.xml index f133ec390c..bf73fa5a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/legal/floss_exception.html" + "https://www.silverpeas.org/legal/loss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,21 +21,21 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses />. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>silverpeas-project</artifactId> - <version>1.3-build210119</version> + <version>1.4.3</version> </parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Silverpeas Components</name> <url>https://www.silverpeas.org/docs/components</url> @@ -53,7 +53,7 @@ <id>Silverpeas</id> <layout>default</layout> <name>Silverpeas Repository</name> - <url>https://www.silverpeas.org/nexus/content/groups/silverpeas</url> + <url>https://nexus3.silverpeas.org/repository/silverpeas</url> <releases> <enabled>true</enabled> </releases> @@ -65,7 +65,7 @@ <properties> <!-- property used by the CI to both deploy a build version and release the next stable version --> - <next.release>6.2</next.release> + <next.release>6.2.4</next.release> <core.version>${project.version}</core.version> </properties> diff --git a/processManager/pom.xml b/processManager/pom.xml index 0eb29f5b29..7748a45c36 100644 --- a/processManager/pom.xml +++ b/processManager/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/processManager/processManager-configuration/pom.xml b/processManager/processManager-configuration/pom.xml index daeb8cd3ac..dffc8c828f 100644 --- a/processManager/processManager-configuration/pom.xml +++ b/processManager/processManager-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>processmanager</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.processmanager</groupId> diff --git a/processManager/processManager-configuration/src/main/config/data/workflowRepository/DemandeCongesSimple/DemandeCongesSimple.xml b/processManager/processManager-configuration/src/main/config/data/workflowRepository/DemandeCongesSimple/DemandeCongesSimple.xml index 795779947c..7aa064a6aa 100644 --- a/processManager/processManager-configuration/src/main/config/data/workflowRepository/DemandeCongesSimple/DemandeCongesSimple.xml +++ b/processManager/processManager-configuration/src/main/config/data/workflowRepository/DemandeCongesSimple/DemandeCongesSimple.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle.properties b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle.properties index d6c2502744..4d11d80b07 100644 --- a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle.properties +++ b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # processManager.action = Action processManager.substituteRoleLabel={0} en remplacement de {1} diff --git a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_de.properties b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_de.properties index d030bbd3d3..f366aea880 100644 --- a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_de.properties +++ b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # processManager.action = Aktion diff --git a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_en.properties b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_en.properties index e965f77b43..9b9ca7460a 100644 --- a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_en.properties +++ b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # processManager.action = Action processManager.substituteRoleLabel={0} as {1}'s substitute diff --git a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_fr.properties b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_fr.properties index 2ce0a23e37..f0511b3e24 100644 --- a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_fr.properties +++ b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/multilang/processManagerBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # processManager.action = Action processManager.substituteRoleLabel={0} en remplacement de {1} diff --git a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/settings/processManagerIcons.properties b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/settings/processManagerIcons.properties index 7523467094..5fe55165e2 100644 --- a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/settings/processManagerIcons.properties +++ b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/settings/processManagerIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # processManager.mandatoryField = /util/icons/mandatoryField.gif processManager.px = /util/icons/colorPix/1px.gif diff --git a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/settings/processManagerSettings.properties b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/settings/processManagerSettings.properties index 83238991c8..7029d8d446 100644 --- a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/settings/processManagerSettings.properties +++ b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/processManager/settings/processManagerSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # pour masquer les boutons retour ( yes / no ) hideReturn = no diff --git a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/util/logging/processManagerLogging.properties b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/util/logging/processManagerLogging.properties index 35f1054f50..9021f90bfc 100644 --- a/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/util/logging/processManagerLogging.properties +++ b/processManager/processManager-configuration/src/main/config/properties/org/silverpeas/util/logging/processManagerLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/processManager/processManager-configuration/src/main/config/xmlcomponents/workflows/demandeCongesSimple.xml b/processManager/processManager-configuration/src/main/config/xmlcomponents/workflows/demandeCongesSimple.xml index 8c9ea9d66c..ca2d5d712d 100644 --- a/processManager/processManager-configuration/src/main/config/xmlcomponents/workflows/demandeCongesSimple.xml +++ b/processManager/processManager-configuration/src/main/config/xmlcomponents/workflows/demandeCongesSimple.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/processManager/processManager-library/pom.xml b/processManager/processManager-library/pom.xml index a9c7c53366..187b9a27d1 100644 --- a/processManager/processManager-library/pom.xml +++ b/processManager/processManager-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>processmanager</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.processmanager</groupId> diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/HistoryStepContent.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/HistoryStepContent.java index 33b13c7139..5c186ab613 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/HistoryStepContent.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/HistoryStepContent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager; diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessFilter.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessFilter.java index 5e64c70708..8bab432963 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessFilter.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager; diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerException.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerException.java index 012f26f08e..122b87c590 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerException.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager; diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerFatalException.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerFatalException.java index 58e2308379..14b8f4a52a 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerFatalException.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerFatalException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager; diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerInstancePostConstruction.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerInstancePostConstruction.java index 7b3fa7a6ab..5e7555172d 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerInstancePostConstruction.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager; diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerInstancePreDestruction.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerInstancePreDestruction.java index 1184c09cef..8121d423ad 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerInstancePreDestruction.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/ProcessManagerInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager; diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/record/QuestionRecord.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/record/QuestionRecord.java index dcfa26ea22..9133a81ba3 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/record/QuestionRecord.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/record/QuestionRecord.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager.record; diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/record/QuestionTemplate.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/record/QuestionTemplate.java index dbd9d88ea3..39fd9e1d61 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/record/QuestionTemplate.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/record/QuestionTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager.record; diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/DefaultProcessManagerService.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/DefaultProcessManagerService.java index 5152eafb9a..dddb2c2fc6 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/DefaultProcessManagerService.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/DefaultProcessManagerService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,19 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager.service; +import org.silverpeas.core.admin.user.model.Group; +import org.silverpeas.core.admin.user.model.UserDetail; import org.silverpeas.core.annotation.Service; +import org.silverpeas.core.contribution.attachment.AttachmentServiceProvider; +import org.silverpeas.core.contribution.attachment.model.DocumentType; +import org.silverpeas.core.contribution.attachment.model.SimpleAttachment; +import org.silverpeas.core.contribution.attachment.model.SimpleDocument; +import org.silverpeas.core.contribution.attachment.model.SimpleDocumentPK; +import org.silverpeas.core.contribution.attachment.model.UnlockContext; import org.silverpeas.core.contribution.content.form.DataRecord; import org.silverpeas.core.contribution.content.form.Field; import org.silverpeas.core.contribution.content.form.FieldTemplate; @@ -32,37 +40,32 @@ import org.silverpeas.core.contribution.content.form.PagesContext; import org.silverpeas.core.contribution.content.form.field.DateField; import org.silverpeas.core.contribution.content.form.field.FileField; +import org.silverpeas.core.contribution.content.form.field.GroupField; import org.silverpeas.core.contribution.content.form.field.TextField; +import org.silverpeas.core.contribution.content.form.field.UserField; import org.silverpeas.core.contribution.content.form.form.XmlForm; import org.silverpeas.core.contribution.content.form.record.GenericDataRecord; -import org.silverpeas.processmanager.ProcessManagerException; +import org.silverpeas.core.i18n.I18NHelper; +import org.silverpeas.core.util.DateUtil; +import org.silverpeas.core.util.MimeTypes; +import org.silverpeas.core.util.StringUtil; +import org.silverpeas.core.util.file.FileRepositoryManager; +import org.silverpeas.core.util.file.FileUtil; +import org.silverpeas.core.util.logging.SilverLogger; import org.silverpeas.core.workflow.api.Workflow; import org.silverpeas.core.workflow.api.WorkflowException; import org.silverpeas.core.workflow.api.event.TaskDoneEvent; +import org.silverpeas.core.workflow.api.instance.ProcessInstance; import org.silverpeas.core.workflow.api.model.Action; import org.silverpeas.core.workflow.api.model.ProcessModel; import org.silverpeas.core.workflow.api.task.Task; import org.silverpeas.core.workflow.api.user.User; import org.silverpeas.core.workflow.engine.user.UserImpl; -import org.silverpeas.core.silvertrace.SilverTrace; -import org.silverpeas.core.admin.user.model.UserDetail; -import org.silverpeas.core.contribution.attachment.AttachmentServiceProvider; -import org.silverpeas.core.contribution.attachment.model.DocumentType; -import org.silverpeas.core.contribution.attachment.model.SimpleAttachment; -import org.silverpeas.core.contribution.attachment.model.SimpleDocument; -import org.silverpeas.core.contribution.attachment.model.SimpleDocumentPK; -import org.silverpeas.core.contribution.attachment.model.UnlockContext; -import org.silverpeas.core.admin.service.OrganizationControllerProvider; -import org.silverpeas.core.util.DateUtil; -import org.silverpeas.core.util.file.FileRepositoryManager; -import org.silverpeas.core.util.file.FileUtil; -import org.silverpeas.core.util.MimeTypes; -import org.silverpeas.core.util.StringUtil; +import org.silverpeas.processmanager.ProcessManagerException; import javax.inject.Singleton; import javax.transaction.Transactional; import java.io.ByteArrayInputStream; -import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -71,8 +74,6 @@ import java.util.List; import java.util.Map; -import static org.silverpeas.core.contribution.attachment.AttachmentService.VERSION_MODE; - /** * Process manager service which manage processes */ @@ -103,7 +104,7 @@ public class DefaultProcessManagerService implements ProcessManagerService { @Override public String createProcess(String componentId, String userId, String fileName, byte[] fileContent) throws ProcessManagerException { - Map<String, FileContent> metadata = new HashMap<>(1); + Map<String, Object> metadata = new HashMap<>(1); metadata.put(null, new FileContent(fileName, fileContent)); return createProcess(componentId, userId, DEFAULT_ROLE, metadata); } @@ -136,7 +137,7 @@ public String createProcess(String componentId, String userId, String fileName, */ @Override public String createProcess(String componentId, String userId, String userRole, - Map<String, ? extends Serializable> metadata) throws ProcessManagerException { + Map<String, Object> metadata) throws ProcessManagerException { // Default map for metadata is an empty map if (metadata == null) { metadata = Collections.emptyMap(); @@ -146,38 +147,11 @@ public String createProcess(String componentId, String userId, String userRole, try { ProcessModel processModel = getProcessModel(componentId); - XmlForm form = (XmlForm) getCreationForm(processModel); + XmlForm form = (XmlForm) getCreationForm(processModel, userRole); GenericDataRecord data = (GenericDataRecord) getEmptyCreationRecord(processModel, userRole); - PagesContext pagesContext = - new PagesContext("creationForm", "0", getLanguage(), true, componentId, userId); - boolean versioningUsed = StringUtil.getBooleanValue(OrganizationControllerProvider. - getOrganisationController().getComponentParameterValue(componentId, VERSION_MODE)); - pagesContext.setVersioningUsed(versioningUsed); // 1 - Populate form data (save file on disk, populate file field) - List<String> attachmentIds = new ArrayList<>(); - - // Populate file name and file content - for (Map.Entry<String, ?> entry : metadata.entrySet()) { - String fieldName = entry.getKey(); - Object fieldValue = entry.getValue(); - - String fieldType = retrieveMatchingFieldTypeName(fieldValue); - Field field = findMatchingField(form, data, fieldName, fieldType); - - if (fieldValue == null) { - populateSimpleField(field, fieldName, null, fieldType); - } else if (fieldValue instanceof Collection<?>) { - populateListField(field, fieldName, (Collection<?>) fieldValue, fieldType); - } else if (FileField.TYPE.equals(fieldType)) { - attachmentIds.add( - populateFileField(form, data, (FileField) field, fieldName, (FileContent) fieldValue, - pagesContext)); - } else { - populateSimpleField(field, fieldName, fieldValue, fieldType); - } - - } + List<String> attachmentIds = populateFields(instanceId, componentId, userId, metadata, data, form); // 2 - Create process instance instanceId = createProcessInstance(processModel, userId, userRole, data); @@ -195,13 +169,49 @@ public String createProcess(String componentId, String userId, String userRole, .unlock(new UnlockContext(attachmentId, userId, null)); } } catch (ProcessManagerException e) { - SilverTrace - .error("processManager", "DefaultProcessManagerService.createProcess()", "root.MSG_GEN_ERROR", e); + SilverLogger.getLogger(this).error("DefaultProcessManagerService.createProcess()", e); throw e; } return instanceId; } + @Override + public void doAction(String action, String processId, String componentId, String userId, + String userRole, Map<String, Object> metadata) throws ProcessManagerException { + try { + ProcessModel processModel = getProcessModel(componentId); + ProcessInstance processInstance = Workflow.getProcessInstanceManager() + .getProcessInstance(processId); + + XmlForm form = (XmlForm) getActionForm(processModel, action, userRole); + GenericDataRecord data = (GenericDataRecord) processModel.getNewActionRecord(action, userRole, + getLanguage(), null); + + // 1 - Populate form data (save file on disk, populate file field) + populateFields(processId, componentId, userId, metadata, data, form); + + // 2 - Create process instance + doAction(action, processInstance, processModel, userId, userRole, data); + + } catch (WorkflowException we) { + throw new ProcessManagerException(this.getClass().getName(), "processManager.CANT_EXECUTE_ACTION", + "action: " + action + ", processInstanceId: " + processId); + } catch (ProcessManagerException e) { + SilverLogger.getLogger(this).error("DefaultProcessManagerService.doAction()", e); + throw e; + } + } + + @Override + public ProcessInstance getProcessInstance(String processId) throws ProcessManagerException { + try { + return Workflow.getProcessInstanceManager().getProcessInstance(processId); + } catch (WorkflowException we) { + throw new ProcessManagerException(this.getClass().getName(), "processManager.CANT_GET_INSTANCE", + "processInstanceId: " + processId); + } + } + /** * Retrieve and return the name of the data type, as expected by form templates in workflow * processing, from the Java data type of a given value object. @@ -220,6 +230,10 @@ private String retrieveMatchingFieldTypeName(Object value) throws ProcessManager return DateField.TYPE; } else if (value instanceof FileContent) { return FileField.TYPE; + } else if (value instanceof Group) { + return GroupField.TYPE; + } else if (value instanceof User) { + return UserField.TYPE; } else if (value instanceof Collection<?>) { Collection<?> col = (Collection<?>) value; if (col.isEmpty()) { @@ -227,9 +241,9 @@ private String retrieveMatchingFieldTypeName(Object value) throws ProcessManager } return retrieveMatchingFieldTypeName(col.iterator().next()); } else { - SilverTrace.error("processManager", "DefaultProcessManagerService.retrieveMatchingFieldTypeName()", - "processManager.FORM_FIELD_BAD_TYPE", "type: " + value.getClass().getName()); - throw new ProcessManagerException("DefaultProcessManagerService", "processManager.FORM_FIELD_BAD_TYPE", + SilverLogger.getLogger(this) + .error("FORM_FIELD_BAD_TYPE", "type: " + value.getClass().getName()); + throw new ProcessManagerException(this.getClass().getName(), "processManager.FORM_FIELD_BAD_TYPE", "type: " + value.getClass().getName()); } } @@ -265,20 +279,16 @@ private Field findMatchingField(XmlForm form, GenericDataRecord data, String nam try { return data.getField(fieldName); } catch (FormException e) { - SilverTrace.error("processManager", "DefaultProcessManagerService.findMatchingField()", - "processManager.FORM_FIELD_NOT_FOUND", - "field name: " + name + ", field type: " + typeName, e); - throw new ProcessManagerException("DefaultProcessManagerService", - "processManager.FORM_FIELD_BAD_TYPE", - "field name: " + name + ", field type: " + typeName, e); + SilverLogger.getLogger(this).error("FORM_FIELD_NOT_FOUND", log(name, typeName), e); + throw new ProcessManagerException(this.getClass().getName(), + "processManager.FORM_FIELD_BAD_TYPE", log(name, typeName), e); } } } - SilverTrace.error("processManager", "DefaultProcessManagerService.findMatchingField()", - "processManager.FORM_FIELD_NOT_FOUND", "field name: " + name + ", field type: " + typeName); - throw new ProcessManagerException("DefaultProcessManagerService", "processManager.FORM_FIELD_NOT_FOUND", - "field name: " + name + ", field type: " + typeName); + SilverLogger.getLogger(this).error("FORM_FIELD_NOT_FOUND", log(name, typeName)); + throw new ProcessManagerException(this.getClass().getName(), "processManager.FORM_FIELD_NOT_FOUND", + log(name, typeName)); } /** @@ -294,6 +304,8 @@ private String getSimpleFieldValueString(Object value, String type) { return value.toString(); } else if (DateField.TYPE.equals(type)) { return (value instanceof Date) ? DateUtil.date2SQLDate((Date) value) : value.toString(); + } else if (GroupField.TYPE.equals(type)) { + return (value instanceof Group) ? ((Group) value).getId() : value.toString(); } } return null; @@ -321,10 +333,9 @@ private void populateSimpleField(Field field, String name, Object value, String } } catch (FormException e) { - SilverTrace.error("processManager", "DefaultProcessManagerService.populateSimpleField()", - "processManager.FORM_FIELD_ERROR", "field name: " + name + ", field type: " + type, e); - throw new ProcessManagerException("DefaultProcessManagerService", "processManager.FORM_FIELD_ERROR", - "field name: " + name + ", field type: " + type, e); + SilverLogger.getLogger(this).error("FORM_FIELD_ERROR", log(name, type), e); + throw new ProcessManagerException(this.getClass().getName(), "processManager.FORM_FIELD_ERROR", + log(name, type), e); } } @@ -364,22 +375,18 @@ private void populateListField(Field field, String name, Collection<?> values, S } String str = getSimpleFieldValueString(value, type); if (str == null) { - SilverTrace.error("processManager", "DefaultProcessManagerService.populateListField()", - "processManager.FORM_FIELD_COLLECTION_NOT_ALLOWED", - "field name: " + name + ", field type: " + type); - throw new ProcessManagerException("DefaultProcessManagerService", - "processManager.FORM_FIELD_COLLECTION_NOT_ALLOWED", - "field name: " + name + ", field type: " + type); + SilverLogger.getLogger(this).error("FORM_FIELD_COLLECTION_NOT_ALLOWED", log(name, type)); + throw new ProcessManagerException(this.getClass().getName(), + "processManager.FORM_FIELD_COLLECTION_NOT_ALLOWED", log(name, type)); } valuesStr.append(str); } field.setStringValue(valuesStr.toString()); } catch (FormException e) { - SilverTrace.error("processManager", "DefaultProcessManagerService.populateListField()", - "processManager.FORM_FIELD_ERROR", "field name: " + name + ", field type: " + type, e); - throw new ProcessManagerException("DefaultProcessManagerService", "processManager.FORM_FIELD_ERROR", - "field name: " + name + ", field type: " + type, e); + SilverLogger.getLogger(this).error("FORM_FIELD_ERROR", log(name, type), e); + throw new ProcessManagerException(this.getClass().getName(), "processManager.FORM_FIELD_ERROR", + log(name, type), e); } } @@ -395,7 +402,7 @@ private String createProcessInstance(ProcessModel processModel, String userId, S Workflow.getWorkflowEngine().process(event); return event.getProcessInstance().getInstanceId(); } catch (WorkflowException e) { - throw new ProcessManagerException("SessionController", + throw new ProcessManagerException(this.getClass().getName(), "processManager.CREATION_PROCESSING_FAILED", e); } } @@ -403,12 +410,12 @@ private String createProcessInstance(ProcessModel processModel, String userId, S /** * Returns the form which starts a new instance. */ - private Form getCreationForm(ProcessModel processModel) throws ProcessManagerException { + private Form getCreationForm(ProcessModel processModel, String role) throws ProcessManagerException { try { - Action creation = processModel.getCreateAction("administrateur"); - return processModel.getPublicationForm(creation.getName(), "administrateur", getLanguage()); + Action creation = processModel.getCreateAction(role); + return processModel.getPublicationForm(creation.getName(), role, getLanguage()); } catch (WorkflowException e) { - throw new ProcessManagerException("SessionController", "processManager.NO_CREATION_FORM", e); + throw new ProcessManagerException(this.getClass().getName(), "processManager.NO_CREATION_FORM", e); } } @@ -421,7 +428,7 @@ private DataRecord getEmptyCreationRecord(ProcessModel processModel, String curr Action creation = processModel.getCreateAction(currentRole); return processModel.getNewActionRecord(creation.getName(), currentRole, getLanguage(), null); } catch (WorkflowException e) { - throw new ProcessManagerException("DefaultProcessManagerService", "processManager.UNKNOWN_ACTION", e); + throw new ProcessManagerException(this.getClass().getName(), "processManager.UNKNOWN_ACTION", e); } } @@ -430,14 +437,11 @@ private DataRecord getEmptyCreationRecord(ProcessModel processModel, String curr */ private Task getCreationTask(ProcessModel processModel, String userId, String currentRole) throws ProcessManagerException { - try { User user = new UserImpl(UserDetail.getById(userId)); - Task creationTask = - Workflow.getTaskManager().getCreationTask(user, currentRole, processModel); - return creationTask; + return Workflow.getTaskManager().getCreationTask(user, currentRole, processModel); } catch (WorkflowException e) { - throw new ProcessManagerException("DefaultProcessManagerService", + throw new ProcessManagerException(this.getClass().getName(), "processManager.CREATION_TASK_UNAVAILABLE", e); } } @@ -449,7 +453,7 @@ private ProcessModel getProcessModel(String modelId) throws ProcessManagerExcept try { return Workflow.getProcessModelManager().getProcessModel(modelId); } catch (WorkflowException e) { - throw new ProcessManagerException("DefaultProcessManagerService", + throw new ProcessManagerException(this.getClass().getName(), "processManager.UNKNOWN_PROCESS_MODEL", modelId, e); } } @@ -473,27 +477,103 @@ private String processUploadedFile(byte[] fileContent, String fileName, } SimpleDocument ad = createSimpleDocument(foreignId, pagesContext.getComponentId(), logicalName, mimeType, - fileContent, DocumentType.attachment, pagesContext.getUserId(), - pagesContext.isVersioningUsed()); + fileContent, pagesContext.getUserId(), pagesContext.isVersioningUsed()); attachmentId = ad.getId(); } return attachmentId; } private SimpleDocument createSimpleDocument(String foreignId, String componentId, String fileName, - String mimeType, byte[] content, DocumentType context, String userId, boolean versioned) { + String mimeType, byte[] content, String userId, boolean versioned) { // create AttachmentPK with spaceId and componentId SimpleDocumentPK simpleDocPk = new SimpleDocumentPK(null, componentId); SimpleDocument doc = new SimpleDocument(simpleDocPk, foreignId, 0, versioned, userId, new SimpleAttachment(fileName, getLanguage(), fileName, "", content.length, mimeType, userId, new Date(), null)); - doc.setDocumentType(context); + doc.setDocumentType(DocumentType.form); return AttachmentServiceProvider.getAttachmentService() .createAttachment(doc, new ByteArrayInputStream(content)); } private String getLanguage() { - return "fr"; + return I18NHelper.defaultLanguage; + } + + private String doAction(String action, ProcessInstance processInstance, ProcessModel processModel, + String userId, String currentRole, DataRecord data) throws ProcessManagerException { + try { + Action creation = processModel.getAction(action); + TaskDoneEvent event = getTask(processInstance, userId, currentRole). + buildTaskDoneEvent(creation.getName(), data); + Workflow.getWorkflowEngine().process(event, true); + return event.getProcessInstance().getInstanceId(); + } catch (WorkflowException e) { + throw new ProcessManagerException(this.getClass().getName(), + "processManager.ACTION_PROCESSING_FAILED", e); + } + } + + private Task getTask(ProcessInstance processInstance, String userId, String currentRole) + throws ProcessManagerException { + try { + User user = new UserImpl(UserDetail.getById(userId)); + Task[] tasks = + Workflow.getTaskManager().getTasks(user, currentRole, processInstance); + if (tasks.length > 0) { + return tasks[0]; + } + throw new ProcessManagerException(this.getClass().getName(), "processManager.NO_TASK"); + } catch (WorkflowException e) { + throw new ProcessManagerException(this.getClass().getName(), + "processManager.TASK_UNAVAILABLE", e); + } + } + + private Form getActionForm(ProcessModel processModel, String actionName, String role) + throws ProcessManagerException { + try { + Action action = processModel.getAction(actionName); + return processModel.getPublicationForm(action.getName(), role, getLanguage()); + } catch (WorkflowException e) { + throw new ProcessManagerException(this.getClass().getName(), "processManager.NO_ACTION_FORM", e); + } + } + + private List<String> populateFields(String processId, String componentId, String userId, + Map<String, Object> metadata, GenericDataRecord data, XmlForm form) + throws ProcessManagerException { + List<String> attachmentIds = new ArrayList<>(); + + PagesContext pagesContext = + new PagesContext("creationForm", "0", getLanguage(), true, componentId, userId); + pagesContext.setObjectId(processId); + + // Populate file name and file content + for (Map.Entry<String, ?> entry : metadata.entrySet()) { + String fieldName = entry.getKey(); + Object fieldValue = entry.getValue(); + + String fieldType = retrieveMatchingFieldTypeName(fieldValue); + Field field = findMatchingField(form, data, fieldName, fieldType); + + if (fieldValue == null) { + populateSimpleField(field, fieldName, null, fieldType); + } else if (fieldValue instanceof Collection<?>) { + populateListField(field, fieldName, (Collection<?>) fieldValue, fieldType); + } else if (FileField.TYPE.equals(fieldType)) { + attachmentIds.add( + populateFileField(form, data, (FileField) field, fieldName, (FileContent) fieldValue, + pagesContext)); + } else { + populateSimpleField(field, fieldName, fieldValue, fieldType); + } + + } + return attachmentIds; + } + + private String log(String fieldName, String fieldType) { + return "field name: " + fieldName + ", field type: " + fieldType; } } diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/FileContent.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/FileContent.java index 644b5dbbbf..8b321ce1ae 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/FileContent.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/FileContent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager.service; diff --git a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/ProcessManagerService.java b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/ProcessManagerService.java index 208e6b9e5c..ad7c57201d 100644 --- a/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/ProcessManagerService.java +++ b/processManager/processManager-library/src/main/java/org/silverpeas/processmanager/service/ProcessManagerService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,13 +19,13 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager.service; +import org.silverpeas.core.workflow.api.instance.ProcessInstance; import org.silverpeas.processmanager.ProcessManagerException; -import java.io.Serializable; import java.util.Map; public interface ProcessManagerService { @@ -75,5 +75,11 @@ String createProcess(String componentId, String userId, String fileName, byte[] * @throws ProcessManagerException */ String createProcess(String componentId, String userId, String userRole, - Map<String, ? extends Serializable> metadata) throws ProcessManagerException; + Map<String, Object> metadata) throws ProcessManagerException; + + void doAction(String action, String processId, String componentId, String userId, + String userRole, Map<String, Object> metadata) throws ProcessManagerException; + + ProcessInstance getProcessInstance(String processId) throws ProcessManagerException; + } diff --git a/processManager/processManager-war/pom.xml b/processManager/processManager-war/pom.xml index 164bf93667..87fc90c75a 100644 --- a/processManager/processManager-war/pom.xml +++ b/processManager/processManager-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>processmanager</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.processmanager</groupId> diff --git a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/LockVO.java b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/LockVO.java index dd813ac074..677cff8bbb 100644 --- a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/LockVO.java +++ b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/LockVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager; diff --git a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/NamedValue.java b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/NamedValue.java index 5d1d1f64ca..146b057015 100644 --- a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/NamedValue.java +++ b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/NamedValue.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager; diff --git a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/ProcessManagerSessionController.java b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/ProcessManagerSessionController.java index 77f1f2ee94..00ba0effa8 100644 --- a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/ProcessManagerSessionController.java +++ b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/ProcessManagerSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager; @@ -911,7 +911,8 @@ private GenericRecordTemplate getAssignTemplate() throws ProcessManagerException for (int j = 0; actors != null && j < actors.length; j++) { GenericFieldTemplate fieldTemplate = new GenericFieldTemplate( - state.getName() + "_" + actors[j].getUserRoleName() + "_" + j, "user"); + processStateName(state.getName()) + "_" + actors[j].getUserRoleName() + "_" + j, + "user"); fieldTemplate.addLabel(state.getLabel(currentRole, getLanguage()), getLanguage()); fieldTemplate.setDisplayerName("user"); fieldTemplate.setMandatory(true); @@ -926,6 +927,15 @@ private GenericRecordTemplate getAssignTemplate() throws ProcessManagerException } } + /** + * Deletion of problematic characters in state name (spaces) + * @param name + * @return + */ + private String processStateName(String name) { + return name.replaceAll(" ", ""); + } + /** * Get assign form (for the re-affectations) */ @@ -951,7 +961,7 @@ public DataRecord getAssignRecord() { actors = currentProcessInstance.getWorkingUsers(activeStates[i]); for (int j = 0; actors != null && j < actors.length; j++) { Field field = - data.getField(activeStates[i] + "_" + actors[j].getUserRoleName() + "_" + j); + data.getField(processStateName(activeStates[i]) + "_" + actors[j].getUserRoleName() + "_" + j); String value = actors[j].getUser().getUserId(); if (value != null) { @@ -989,7 +999,7 @@ public void reAssign(DataRecord data) throws ProcessManagerException { // assign new working users for (int j = 0; j < oldUsers.length; j++) { String roleName = oldUsers[j].getUserRoleName(); - Field field = data.getField(activeState + "_" + roleName + "_" + j); + Field field = data.getField(processStateName(activeState) + "_" + roleName + "_" + j); String userId = field.getStringValue(); User user = Workflow.getUserManager().getUser(userId); Actor newActor = Workflow.getProcessInstanceManager().createActor( diff --git a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/StepVO.java b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/StepVO.java index 0129a89b0f..d0d9d26457 100644 --- a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/StepVO.java +++ b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/StepVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager; diff --git a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/FunctionHandler.java b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/FunctionHandler.java index 82c9ae087c..85405fc60b 100644 --- a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/FunctionHandler.java +++ b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/FunctionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager.servlets; diff --git a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/ProcessManagerRequestRouter.java b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/ProcessManagerRequestRouter.java index 62b6fc7922..3074b6d6a9 100644 --- a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/ProcessManagerRequestRouter.java +++ b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/ProcessManagerRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager.servlets; diff --git a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/SessionSafeFunctionHandler.java b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/SessionSafeFunctionHandler.java index 0f3cd08cd2..f480f6fc5f 100644 --- a/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/SessionSafeFunctionHandler.java +++ b/processManager/processManager-war/src/main/java/org/silverpeas/processmanager/servlets/SessionSafeFunctionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.processmanager.servlets; diff --git a/processManager/processManager-war/src/main/webapp/WEB-INF/web.xml b/processManager/processManager-war/src/main/webapp/WEB-INF/web.xml index 5f1a8bf471..48d509d8ef 100644 --- a/processManager/processManager-war/src/main/webapp/WEB-INF/web.xml +++ b/processManager/processManager-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/admin/reAssign.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/admin/reAssign.jsp index 1f19103b4e..d3cc3f6ef8 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/admin/reAssign.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/admin/reAssign.jsp @@ -3,7 +3,7 @@ <%@ page import="org.silverpeas.core.contribution.content.form.PagesContext" %> <%@ page import="org.silverpeas.core.contribution.content.form.DataRecord" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -15,7 +15,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,7 +23,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/admin/viewErrors.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/admin/viewErrors.jsp index b2c6603aae..c0c7d42b13 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/admin/viewErrors.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/admin/viewErrors.jsp @@ -1,7 +1,7 @@ <%@ page import="org.silverpeas.core.workflow.api.instance.ProcessInstance" %> <%@ page import="org.silverpeas.core.workflow.api.error.WorkflowError" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/attachmentManager.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/attachmentManager.jsp index a01faadbef..149f68ad20 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/attachmentManager.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/attachmentManager.jsp @@ -2,7 +2,7 @@ <%@ page import="org.silverpeas.core.util.URLUtil" %> <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -14,7 +14,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +22,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/checkProcessManager.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/checkProcessManager.jsp index c875460f7d..fdd0891464 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/checkProcessManager.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/checkProcessManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/createProcess.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/createProcess.jsp index ad7460217d..bb00649202 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/createProcess.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/createProcess.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.contribution.content.form.Form" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/editAction.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/editAction.jsp index 052227d217..1b66108892 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/editAction.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/editAction.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.contribution.content.form.Form" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/editQuestion.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/editQuestion.jsp index ce12f6f74d..0ed92782ba 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/editQuestion.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/editQuestion.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.contribution.content.form.Form" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/editResponse.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/editResponse.jsp index 4619c084cd..22da77ba55 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/editResponse.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/editResponse.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.contribution.content.form.Form" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/editUserSettings.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/editUserSettings.jsp index 27084e9f11..59d1a10e44 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/editUserSettings.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/editUserSettings.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.contribution.content.form.Form" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement-templates.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement-templates.jsp index 30ff4d08ab..0136c90090 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement-templates.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement-templates.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement.js b/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement.js index fba91807c2..9e5bfd60e0 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement.js +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ (function() { diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement.service.js b/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement.service.js index 8ad35092cb..9aecc2ccbf 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement.service.js +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/javaScript/vuejs/replacement.service.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ (function() { diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/listProcess.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/listProcess.jsp index a4b66fc5f4..d31a43a886 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/listProcess.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/listProcess.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/listQuestions.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/listQuestions.jsp index ab604572fb..56d8b45348 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/listQuestions.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/listQuestions.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.contribution.content.form.Form" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/multiWindowDetected.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/multiWindowDetected.jsp index 4d0e756cd0..ab064aff06 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/multiWindowDetected.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/multiWindowDetected.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/replacements.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/replacements.jsp index 9e938a01cb..be5e0d1523 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/replacements.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/replacements.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ include file="checkProcessManager.jsp" %> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/viewHistory.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/viewHistory.jsp index 5fb957644f..c70fd4b73b 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/viewHistory.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/viewHistory.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/processManager/processManager-war/src/main/webapp/processManager/jsp/viewProcess.jsp b/processManager/processManager-war/src/main/webapp/processManager/jsp/viewProcess.jsp index db09f39407..a392f7ec77 100644 --- a/processManager/processManager-war/src/main/webapp/processManager/jsp/viewProcess.jsp +++ b/processManager/processManager-war/src/main/webapp/processManager/jsp/viewProcess.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/pom.xml b/projectManager/pom.xml index f2b2fb475e..f4acf592d0 100644 --- a/projectManager/pom.xml +++ b/projectManager/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/projectManager/projectManager-configuration/pom.xml b/projectManager/projectManager-configuration/pom.xml index 3fc3570a34..24a586e872 100644 --- a/projectManager/projectManager-configuration/pom.xml +++ b/projectManager/projectManager-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>projectmanager</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.projectmanager</groupId> diff --git a/projectManager/projectManager-configuration/src/main/config/migrations/modules/projectManager-migration.xml b/projectManager/projectManager-configuration/src/main/config/migrations/modules/projectManager-migration.xml index 4be31547a1..d1cb49ecfd 100644 --- a/projectManager/projectManager-configuration/src/main/config/migrations/modules/projectManager-migration.xml +++ b/projectManager/projectManager-configuration/src/main/config/migrations/modules/projectManager-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="projectManager" diff --git a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle.properties b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle.properties index 27cace0ac2..e47b6ec6d7 100644 --- a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle.properties +++ b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # projectManager.Taches = Actions projectManager.Tache = Action diff --git a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_de.properties b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_de.properties index 80a492f526..6d3c2fb0a4 100644 --- a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_de.properties +++ b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # projectManager.Taches = Tasks projectManager.Tache = Task diff --git a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_en.properties b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_en.properties index 6b5f5ef991..3057d17354 100644 --- a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_en.properties +++ b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # projectManager.Taches = Actions projectManager.Tache = Action diff --git a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_fr.properties b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_fr.properties index 7f1624f316..12f76de9f4 100644 --- a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_fr.properties +++ b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/multilang/projectManagerBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # projectManager.Taches = T\u00e2ches projectManager.Tache = T\u00e2che diff --git a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/settings/projectManagerIcons.properties b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/settings/projectManagerIcons.properties index 7b0c0a78f5..0301c467a7 100644 --- a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/settings/projectManagerIcons.properties +++ b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/projectManager/settings/projectManagerIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # projectManager.mandatoryField = /util/icons/mandatoryField.gif projectManager.update = /util/icons/update.gif diff --git a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/util/logging/projectManagerLogging.properties b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/util/logging/projectManagerLogging.properties index c9ee7ae8b0..3a0ba9c2b6 100644 --- a/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/util/logging/projectManagerLogging.properties +++ b/projectManager/projectManager-configuration/src/main/config/properties/org/silverpeas/util/logging/projectManagerLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/projectManager/projectManager-configuration/src/main/config/xmlcomponents/projectManager.xml b/projectManager/projectManager-configuration/src/main/config/xmlcomponents/projectManager.xml index 8786021931..13a981c93f 100644 --- a/projectManager/projectManager-configuration/src/main/config/xmlcomponents/projectManager.xml +++ b/projectManager/projectManager-configuration/src/main/config/xmlcomponents/projectManager.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/projectManager/projectManager-library/pom.xml b/projectManager/projectManager-library/pom.xml index 097a7c3a45..4bf2b852a1 100644 --- a/projectManager/projectManager-library/pom.xml +++ b/projectManager/projectManager-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>projectmanager</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.projectmanager</groupId> diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerInstancePreDestruction.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerInstancePreDestruction.java index 53b63b5ca2..745fe39fe4 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerInstancePreDestruction.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager; diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerStatistics.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerStatistics.java index da9247dfcf..0082bd8172 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerStatistics.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager; diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/Filtre.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/Filtre.java index 9c1a878135..900bee909e 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/Filtre.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/Filtre.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/HolidayDetail.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/HolidayDetail.java index feeddd4117..83f4a8f06e 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/HolidayDetail.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/HolidayDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.model; diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerCalendarDAO.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerCalendarDAO.java index a13ce877a8..d635514cf6 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerCalendarDAO.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerCalendarDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerDAO.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerDAO.java index e693dd7417..e4ffb8588c 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerDAO.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerRuntimeException.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerRuntimeException.java index 8696433d09..6d56bf0900 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerRuntimeException.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/ProjectManagerRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.model; diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskDetail.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskDetail.java index 5859a0be63..41d9a39eb0 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskDetail.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.model; diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskPK.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskPK.java index 37232f3745..450796c78a 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskPK.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskPK.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskResourceDetail.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskResourceDetail.java index a6f45b5785..b904792131 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskResourceDetail.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/model/TaskResourceDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.model; diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/service/DefaultProjectManagerService.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/service/DefaultProjectManagerService.java index 7e5a69d058..6fa39903c1 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/service/DefaultProjectManagerService.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/service/DefaultProjectManagerService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.service; diff --git a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/service/ProjectManagerService.java b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/service/ProjectManagerService.java index bf8a955ee4..83c8f0e065 100644 --- a/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/service/ProjectManagerService.java +++ b/projectManager/projectManager-library/src/main/java/org/silverpeas/components/projectmanager/service/ProjectManagerService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.service; diff --git a/projectManager/projectManager-war/pom.xml b/projectManager/projectManager-war/pom.xml index 23c1069968..01e92c61f1 100644 --- a/projectManager/projectManager-war/pom.xml +++ b/projectManager/projectManager-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>projectmanager</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.projectmanager</groupId> diff --git a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerIndexer.java b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerIndexer.java index 75347e81b6..4db39d99be 100644 --- a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerIndexer.java +++ b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/ProjectManagerIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/control/ProjectManagerSessionController.java b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/control/ProjectManagerSessionController.java index 38d25b79d5..11f4b0ed3a 100644 --- a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/control/ProjectManagerSessionController.java +++ b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/control/ProjectManagerSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.control; diff --git a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/servlets/AjaxProjectManagerServlet.java b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/servlets/AjaxProjectManagerServlet.java index daedfeab55..efb4a616a7 100644 --- a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/servlets/AjaxProjectManagerServlet.java +++ b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/servlets/AjaxProjectManagerServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.servlets; diff --git a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/servlets/ProjectManagerRequestRouter.java b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/servlets/ProjectManagerRequestRouter.java index bdf64441af..09f734e889 100644 --- a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/servlets/ProjectManagerRequestRouter.java +++ b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/servlets/ProjectManagerRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.servlets; diff --git a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/DayVO.java b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/DayVO.java index 26e9685e1a..0129ef1fa2 100644 --- a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/DayVO.java +++ b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/DayVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.vo; diff --git a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/MonthVO.java b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/MonthVO.java index 06b6c6588d..c1d62f3d56 100644 --- a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/MonthVO.java +++ b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/MonthVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.vo; diff --git a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/WeekVO.java b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/WeekVO.java index 81defad165..364b6c97f9 100644 --- a/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/WeekVO.java +++ b/projectManager/projectManager-war/src/main/java/org/silverpeas/components/projectmanager/vo/WeekVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.projectmanager.vo; diff --git a/projectManager/projectManager-war/src/main/webapp/WEB-INF/web.xml b/projectManager/projectManager-war/src/main/webapp/WEB-INF/web.xml index 2a8630d56b..0456fa7333 100644 --- a/projectManager/projectManager-war/src/main/webapp/WEB-INF/web.xml +++ b/projectManager/projectManager-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/calendar.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/calendar.jsp index 423c7a277f..5b633c1bdf 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/calendar.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/calendar.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.util.MultiSilverpeasBundle" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/check.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/check.jsp index 46f03cdea7..ad6a03dbe9 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/check.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt.jsp index 8c50696718..7fa7dffc8b 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt_legend.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt_legend.jsp index 4c37572062..c7e9e7fd41 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt_legend.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt_legend.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt_months.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt_months.jsp index 2cef24f0a5..643b8f0a04 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt_months.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/gantt_months.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/js/ajax_project.js b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/js/ajax_project.js index 3a390b4e7e..cdad83d018 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/js/ajax_project.js +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/js/ajax_project.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/portlet.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/portlet.jsp index d066b4ac23..51098c75f5 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/portlet.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectDefinition.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectDefinition.jsp index 804e1758b6..13781a35c6 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectDefinition.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectDefinition.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectNotDefined.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectNotDefined.jsp index 8536e05594..538794e42b 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectNotDefined.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectNotDefined.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectView.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectView.jsp index b0c6ae63f5..0b876e8477 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectView.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/projectView.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.util.WebEncodeHelper"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/refreshFromUserSelect.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/refreshFromUserSelect.jsp index eeb0b7aad4..6b4db96283 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/refreshFromUserSelect.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/refreshFromUserSelect.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskAdd.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskAdd.jsp index 3f942f2df0..3945291b7a 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskAdd.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskAdd.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskUpdate.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskUpdate.jsp index 27c1fb1189..740758310d 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskUpdate.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskUpdate.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskView.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskView.jsp index fb9f9ab086..b9160a5905 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskView.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/taskView.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.util.WebEncodeHelper"%> diff --git a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/tasksList.jsp b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/tasksList.jsp index 46ff7cb31b..7deec7b40e 100644 --- a/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/tasksList.jsp +++ b/projectManager/projectManager-war/src/main/webapp/projectManager/jsp/tasksList.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="java.util.ArrayList" %> <%@ page import="java.util.Collections" %> diff --git a/questionReply/pom.xml b/questionReply/pom.xml index f07bb0cd1c..91a79f3fc2 100644 --- a/questionReply/pom.xml +++ b/questionReply/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/questionReply/questionReply-configuration/pom.xml b/questionReply/questionReply-configuration/pom.xml index 35ec0fdf51..805c70795c 100644 --- a/questionReply/questionReply-configuration/pom.xml +++ b/questionReply/questionReply-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>questionreply</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.questionreply</groupId> diff --git a/questionReply/questionReply-configuration/src/main/config/migrations/modules/questionReply-migration.xml b/questionReply/questionReply-configuration/src/main/config/migrations/modules/questionReply-migration.xml index 79e94ea32c..d13862a69c 100644 --- a/questionReply/questionReply-configuration/src/main/config/migrations/modules/questionReply-migration.xml +++ b/questionReply/questionReply-configuration/src/main/config/migrations/modules/questionReply-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="questionReply" diff --git a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle.properties b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle.properties index d5f4af3d85..101988301b 100644 --- a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle.properties +++ b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # questionReply.addQR = Ajouter une FAQ questionReply.addQ = Poser une question diff --git a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_de.properties b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_de.properties index 94dda0fddd..71ab1bb4cd 100644 --- a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_de.properties +++ b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # questionReply.addQR = Eine FAQ hinzuf\u00fcgen diff --git a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_en.properties b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_en.properties index ab446eca88..fc6f4c7f20 100644 --- a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_en.properties +++ b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # questionReply.addQR = Add a FAQ questionReply.addQ = Ask a question diff --git a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_fr.properties b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_fr.properties index dad3ad9e27..f746fbed55 100644 --- a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_fr.properties +++ b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/multilang/questionReplyBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # questionReply.addQR = Ajouter une FAQ questionReply.addQ = Poser une question diff --git a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/settings/questionReplyIcons.properties b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/settings/questionReplyIcons.properties index c779710688..5f22012846 100644 --- a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/settings/questionReplyIcons.properties +++ b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/questionReply/settings/questionReplyIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # questionReply.minicone = /util/icons/questionReply_RepPublik.gif questionReply.miniconeQuestion = /util/icons/question.gif diff --git a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/util/logging/QuestionReplyLogging.properties b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/util/logging/QuestionReplyLogging.properties index 3b1226a056..0c59a54ef8 100644 --- a/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/util/logging/QuestionReplyLogging.properties +++ b/questionReply/questionReply-configuration/src/main/config/properties/org/silverpeas/util/logging/QuestionReplyLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/questionReply/questionReply-configuration/src/main/config/resources/QuestionReply/ExportFAQ.css b/questionReply/questionReply-configuration/src/main/config/resources/QuestionReply/ExportFAQ.css index 61b521f1b4..51dda92109 100644 --- a/questionReply/questionReply-configuration/src/main/config/resources/QuestionReply/ExportFAQ.css +++ b/questionReply/questionReply-configuration/src/main/config/resources/QuestionReply/ExportFAQ.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /************************************* diff --git a/questionReply/questionReply-configuration/src/main/config/xmlcomponents/questionReply.xml b/questionReply/questionReply-configuration/src/main/config/xmlcomponents/questionReply.xml index 46f12c555e..981163e904 100644 --- a/questionReply/questionReply-configuration/src/main/config/xmlcomponents/questionReply.xml +++ b/questionReply/questionReply-configuration/src/main/config/xmlcomponents/questionReply.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/questionReply/questionReply-library/pom.xml b/questionReply/questionReply-library/pom.xml index a3471b4d4f..292601cb95 100644 --- a/questionReply/questionReply-library/pom.xml +++ b/questionReply/questionReply-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>questionreply</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.questionreply</groupId> diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyException.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyException.java index 8419a90dcf..3bfc340f2b 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyException.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyInstancePreDestruction.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyInstancePreDestruction.java index c91066a366..7e150733a0 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyInstancePreDestruction.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyStatistics.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyStatistics.java index a1ea2869cb..1fd85b1aa5 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyStatistics.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/QuestionReplyStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/index/QuestionIndexer.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/index/QuestionIndexer.java index b452c4aea3..c660318f92 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/index/QuestionIndexer.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/index/QuestionIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.index; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Category.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Category.java index 2d617471d4..4cdc135c63 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Category.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Category.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.model; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Question.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Question.java index 9207cdf70d..a118e3e456 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Question.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Question.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.model; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/QuestionDetail.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/QuestionDetail.java index 6533878179..24d2d758f1 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/QuestionDetail.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/QuestionDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.model; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Recipient.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Recipient.java index 1ff56d441f..5f0e8ad247 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Recipient.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Recipient.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.model; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Reply.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Reply.java index 89be6d349d..cc477454b6 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Reply.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/model/Reply.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.model; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionHeader.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionHeader.java index b35f8f6b2c..51cf4e421e 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionHeader.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionManager.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionManager.java index e7b561151e..f760bb55a4 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionManager.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionManagerProvider.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionManagerProvider.java index 0adcc58526..f9bcdc2543 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionManagerProvider.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionManagerProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionRegexpComparator.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionRegexpComparator.java index 7c60f7337f..03ca6b8cbf 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionRegexpComparator.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionRegexpComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionReplyContentManager.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionReplyContentManager.java index 602f081ded..0ef947eab5 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionReplyContentManager.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/QuestionReplyContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/SilverpeasQuestionManager.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/SilverpeasQuestionManager.java index 18c03bdc62..2aee94ff49 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/SilverpeasQuestionManager.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/SilverpeasQuestionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/AbstractNotifier.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/AbstractNotifier.java index de3313bd39..d8c1d309c2 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/AbstractNotifier.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/AbstractNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service.notification; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/AbstractReplyNotifier.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/AbstractReplyNotifier.java index 7f24a6c987..1969eca2cd 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/AbstractReplyNotifier.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/AbstractReplyNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service.notification; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/NotificationData.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/NotificationData.java index 9b8aa0133e..2220b7f05a 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/NotificationData.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/NotificationData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service.notification; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/QuestionNotifier.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/QuestionNotifier.java index 6786067928..d0b7a3f9ea 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/QuestionNotifier.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/QuestionNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service.notification; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/ReplyNotifier.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/ReplyNotifier.java index b359d0a244..9fe66bfa06 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/ReplyNotifier.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/ReplyNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service.notification; diff --git a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/SubscriptionNotifier.java b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/SubscriptionNotifier.java index 269f8f664a..af9bf20fe6 100644 --- a/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/SubscriptionNotifier.java +++ b/questionReply/questionReply-library/src/main/java/org/silverpeas/components/questionreply/service/notification/SubscriptionNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service.notification; diff --git a/questionReply/questionReply-library/src/test/java/org/silverpeas/components/questionreply/service/QuestionRegexpComparatorTest.java b/questionReply/questionReply-library/src/test/java/org/silverpeas/components/questionreply/service/QuestionRegexpComparatorTest.java index d911371425..c9781a3cdc 100644 --- a/questionReply/questionReply-library/src/test/java/org/silverpeas/components/questionreply/service/QuestionRegexpComparatorTest.java +++ b/questionReply/questionReply-library/src/test/java/org/silverpeas/components/questionreply/service/QuestionRegexpComparatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service; diff --git a/questionReply/questionReply-library/src/test/java/org/silverpeas/components/questionreply/service/SilverpeasQuestionManagerReplayDaoTest.java b/questionReply/questionReply-library/src/test/java/org/silverpeas/components/questionreply/service/SilverpeasQuestionManagerReplayDaoTest.java index 021320bf38..76b357ab92 100644 --- a/questionReply/questionReply-library/src/test/java/org/silverpeas/components/questionreply/service/SilverpeasQuestionManagerReplayDaoTest.java +++ b/questionReply/questionReply-library/src/test/java/org/silverpeas/components/questionreply/service/SilverpeasQuestionManagerReplayDaoTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.service; diff --git a/questionReply/questionReply-library/src/test/resources/META-INF/beans.xml b/questionReply/questionReply-library/src/test/resources/META-INF/beans.xml index 1c84372d81..96c3327938 100644 --- a/questionReply/questionReply-library/src/test/resources/META-INF/beans.xml +++ b/questionReply/questionReply-library/src/test/resources/META-INF/beans.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <beans diff --git a/questionReply/questionReply-library/src/test/resources/META-INF/persistence.xml b/questionReply/questionReply-library/src/test/resources/META-INF/persistence.xml index e473595247..971ede8a0e 100644 --- a/questionReply/questionReply-library/src/test/resources/META-INF/persistence.xml +++ b/questionReply/questionReply-library/src/test/resources/META-INF/persistence.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" diff --git a/questionReply/questionReply-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer b/questionReply/questionReply-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer index 9785bab5e6..02b5b225ce 100644 --- a/questionReply/questionReply-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer +++ b/questionReply/questionReply-library/src/test/resources/META-INF/services/org.silverpeas.core.util.BeanContainer @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # org.silverpeas.core.test.TestBeanContainer \ No newline at end of file diff --git a/questionReply/questionReply-war/pom.xml b/questionReply/questionReply-war/pom.xml index d093ac2b12..55242b1d54 100644 --- a/questionReply/questionReply-war/pom.xml +++ b/questionReply/questionReply-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>questionreply</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.questionreply</groupId> diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/QuestionReplyIndexer.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/QuestionReplyIndexer.java index 3c72070e09..b0cabd693d 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/QuestionReplyIndexer.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/QuestionReplyIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply; diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/control/QuestionReplyExport.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/control/QuestionReplyExport.java index 6a6a0da849..dfe3f53c4f 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/control/QuestionReplyExport.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/control/QuestionReplyExport.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.control; diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/control/QuestionReplySessionController.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/control/QuestionReplySessionController.java index cbf014aa57..a37037a82c 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/control/QuestionReplySessionController.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/control/QuestionReplySessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.control; diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/servlets/GoToQuestion.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/servlets/GoToQuestion.java index 4f71323bca..357453b9c4 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/servlets/GoToQuestion.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/servlets/GoToQuestion.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.servlets; diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/servlets/QuestionReplyRequestRouter.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/servlets/QuestionReplyRequestRouter.java index 99407d887b..105d058c9f 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/servlets/QuestionReplyRequestRouter.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/servlets/QuestionReplyRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.servlets; @@ -50,6 +50,8 @@ public class QuestionReplyRequestRouter extends ComponentRequestRouter<QuestionReplySessionController> { private static final long serialVersionUID = 442480445762334578L; + private static final String PARAM_QUESTION_ID = "QuestionId"; + private static final String PARAM_CATEGORY_ID = "CategoryId"; /** * This method has to be implemented in the component request rooter class. returns the session @@ -97,18 +99,18 @@ public String getDestination(String function, QuestionReplySessionController scc request.setAttribute("Flag", flag); request.setAttribute("Categories", scc.getAllCategories()); request.setAttribute("PDCUsed", scc.isPDCUsed()); - if (request.getAttribute("QuestionId") != null) { - Question question = - scc.getQuestion(Long.parseLong((String) request.getAttribute("QuestionId"))); - String categoryId = question.getCategoryId(); + String questionId = (String) request.getAttribute(PARAM_QUESTION_ID); + String categoryId = (String) request.getAttribute(PARAM_CATEGORY_ID); + if (StringUtil.isDefined(questionId)) { + Question question = scc.getQuestion(Long.parseLong(questionId)); + categoryId = question.getCategoryId(); if (!StringUtil.isDefined(categoryId)) { categoryId = "null"; } - destination = "/questionReply/jsp/listQuestionsDHTML.jsp?categoryId=" + categoryId + - "&questionId=" + question.getPK().getId(); - } else { - destination = "/questionReply/jsp/listQuestionsDHTML.jsp"; + questionId = question.getPK().getId(); } + destination = "/questionReply/jsp/listQuestionsDHTML.jsp" + "?categoryId=" + categoryId + + "&questionId=" + questionId; } else if ("DeleteQ".equals(function)) { String id = request.getParameter("Id"); if (StringUtil.isLong(id)) { @@ -155,7 +157,7 @@ public String getDestination(String function, QuestionReplySessionController scc } } else if ("CloseQuestion".equals(function)) { if (scc.isUserExpert()) { - scc.closeQuestion(Long.parseLong(request.getParameter("QuestionId"))); + scc.closeQuestion(Long.parseLong(request.getParameter(PARAM_QUESTION_ID))); destination = getDestination("Main", scc, request); } else { destination = "/admin/jsp/errorpage.jsp"; @@ -173,11 +175,11 @@ public String getDestination(String function, QuestionReplySessionController scc Question question = scc.getQuestion(Long.parseLong(questionId)); scc.setCurrentQuestion(question); - request.setAttribute("QuestionId", questionId); + request.setAttribute(PARAM_QUESTION_ID, questionId); destination = getDestination("Main", scc, request); } else if ("UpdateQ".equals(function)) { // mettre à jour la question courante - String questionId = request.getParameter("QuestionId"); + String questionId = request.getParameter(PARAM_QUESTION_ID); Question question = scc.getQuestion(Long.parseLong(questionId)); scc.setCurrentQuestion(question); request.setAttribute("question", question); @@ -185,7 +187,7 @@ public String getDestination(String function, QuestionReplySessionController scc request.setAttribute("AllCategories", scc.getAllCategories()); destination = "/questionReply/jsp/updateQ.jsp"; } else if ("DeleteR".equals(function)) { - String questionId = request.getParameter("QuestionId"); + String questionId = request.getParameter(PARAM_QUESTION_ID); if (StringUtil.isLong(questionId) && scc.isUserExpert()) { Question question = scc.getQuestion(Long.parseLong(questionId)); scc.setCurrentQuestion(question); @@ -200,12 +202,12 @@ public String getDestination(String function, QuestionReplySessionController scc destination = getDestination("Main", scc, request); } else if ("EffectiveUpdateQ".equals(function)) { scc.updateCurrentQuestion(request.getParameter("title"), request.getParameter("content"), - request.getParameter("CategoryId")); + request.getParameter(PARAM_CATEGORY_ID)); String questionId = request.getParameter("questionId"); - request.setAttribute("QuestionId", questionId); + request.setAttribute(PARAM_QUESTION_ID, questionId); destination = getDestination("Main", scc, request); } else if ("CreateRQuery".equals(function)) { - String id = request.getParameter("QuestionId"); + String id = request.getParameter(PARAM_QUESTION_ID); Question question = scc.getQuestion(Long.parseLong(id)); scc.setCurrentQuestion(question); // passer le paramètre pour savoir si on utilise les réponses privées @@ -228,7 +230,7 @@ public String getDestination(String function, QuestionReplySessionController scc scc.saveNewReply(request.getUploadedFiles()); if (scc.getCurrentQuestion() != null) { - request.setAttribute("QuestionId", scc.getCurrentQuestion().getPK().getId()); + request.setAttribute(PARAM_QUESTION_ID, scc.getCurrentQuestion().getPK().getId()); } destination = getDestination("Main", scc, request); @@ -236,7 +238,7 @@ public String getDestination(String function, QuestionReplySessionController scc request.setAttribute("reply", scc.getCurrentReply()); destination = "/questionReply/jsp/updateR.jsp"; } else if ("UpdateR".equals(function)) { - String questionId = request.getParameter("QuestionId"); + String questionId = request.getParameter(PARAM_QUESTION_ID); Question question = scc.getQuestion(Long.parseLong(questionId)); scc.setCurrentQuestion(question); String id = request.getParameter("replyId"); @@ -247,7 +249,7 @@ public String getDestination(String function, QuestionReplySessionController scc } else if ("EffectiveUpdateR".equals(function)) { scc.updateCurrentReply(request.getParameter("title"), request.getParameter("content")); if (scc.getCurrentQuestion() != null) { - request.setAttribute("QuestionId", scc.getCurrentQuestion().getPK().getId()); + request.setAttribute(PARAM_QUESTION_ID, scc.getCurrentQuestion().getPK().getId()); } destination = getDestination("Main", scc, request); @@ -259,7 +261,7 @@ public String getDestination(String function, QuestionReplySessionController scc } else if ("EffectiveCreateQR".equals(function)) { scc.setNewQuestionContent(request.getParameter("title"), request.getParameter("content"), - request.getParameter("CategoryId")); + request.getParameter(PARAM_CATEGORY_ID)); scc.setNewReplyContent(request.getParameter("titleR"), request.getParameter("contentR"), 1, 0); // Get classification positions @@ -268,7 +270,7 @@ public String getDestination(String function, QuestionReplySessionController scc String id = Long.toString(questionId); scc.classifyQuestionReply(questionId, positions); scc.getQuestion(questionId); - request.setAttribute("QuestionId", id); + request.setAttribute(PARAM_QUESTION_ID, id); request.setAttribute("contentId", scc.getCurrentQuestionContentId()); destination = getDestination("Main", scc, request); } else if ("CreateQQuery".equals(function)) { @@ -285,12 +287,12 @@ public String getDestination(String function, QuestionReplySessionController scc } else if ("EffectiveCreateQ".equals(function)) { if ("publisher".equals(flag) || "admin".equals(flag) || "writer".equals(flag)) { scc.setNewQuestionContent(request.getParameter("title"), request.getParameter("content"), - request.getParameter("CategoryId")); + request.getParameter(PARAM_CATEGORY_ID)); long questionId = scc.saveNewQuestion(); String id = Long.toString(questionId); String positions = request.getParameter("Positions"); scc.classifyQuestionReply(questionId, positions); - request.setAttribute("QuestionId", id); + request.setAttribute(PARAM_QUESTION_ID, id); destination = getDestination("Main", scc, request); } else { destination = "/admin/jsp/errorpage.jsp"; @@ -308,7 +310,7 @@ public String getDestination(String function, QuestionReplySessionController scc scc.createCategory(category); destination = getDestination("Main", scc, request); } else if ("UpdateCategory".equals(function)) { - String categoryId = request.getParameter("CategoryId"); + String categoryId = request.getParameter(PARAM_CATEGORY_ID); Category category = scc.getCategory(categoryId); String name = request.getParameter("Name"); category.setName(name); @@ -319,7 +321,7 @@ public String getDestination(String function, QuestionReplySessionController scc destination = getDestination("Main", scc, request); } else if ("DeleteCategory".equals(function)) { - String categoryId = request.getParameter("CategoryId"); + String categoryId = request.getParameter(PARAM_CATEGORY_ID); scc.deleteCategory(categoryId); destination = getDestination("Main", scc, request); @@ -330,26 +332,25 @@ public String getDestination(String function, QuestionReplySessionController scc if ("Question".equals(type)) { // traitement des questions - request.setAttribute("QuestionId", id); - destination = getDestination("Main", scc, request); + request.setAttribute(PARAM_QUESTION_ID, id); } else if (type.startsWith("Reply")) { // traitement des réponses, on arrive sur la question contenant la réponse Reply reply = scc.getReply(Long.parseLong(id)); long questionId = reply.getQuestionId(); - request.setAttribute("QuestionId", Long.toString(questionId)); - destination = getDestination("Main", scc, request); + request.setAttribute(PARAM_QUESTION_ID, Long.toString(questionId)); } else if (type.startsWith("Publication")) { // traitement des fichiers joints Reply reply = scc.getReply(Long.valueOf(id)); long questionId = reply.getQuestionId(); - request.setAttribute("QuestionId", Long.toString(questionId)); - destination = getDestination("Main", scc, request); + request.setAttribute(PARAM_QUESTION_ID, Long.toString(questionId)); + } else if ("Node".equalsIgnoreCase(type)) { + request.setAttribute(PARAM_CATEGORY_ID, id); } else { if (StringUtil.isDefined(id)) { - request.setAttribute("QuestionId", id); + request.setAttribute(PARAM_QUESTION_ID, id); } - destination = getDestination("Main", scc, request); } + destination = getDestination("Main", scc, request); } else if ("Export".equals(function)) { MultiSilverpeasBundle resource = (MultiSilverpeasBundle) request.getAttribute("resources"); ExportReport report = scc.export(resource); @@ -370,4 +371,4 @@ public String getDestination(String function, QuestionReplySessionController scc return destination; } -} \ No newline at end of file +} diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/AuthorEntity.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/AuthorEntity.java index e812de9d1f..2787f4c092 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/AuthorEntity.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/AuthorEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.web; diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionEntity.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionEntity.java index 4b9e2d8869..78e01fcd7a 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionEntity.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.web; diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionReplyBaseWebService.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionReplyBaseWebService.java index 609b4c0f97..8694dab8a2 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionReplyBaseWebService.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionReplyBaseWebService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.web; diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionResource.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionResource.java index 725bd7656c..b61c359287 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionResource.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/QuestionResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.web; diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/ReplyEntity.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/ReplyEntity.java index 33eeb94882..1f9cf002c2 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/ReplyEntity.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/ReplyEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.web; diff --git a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/ReplyResource.java b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/ReplyResource.java index 6192753936..45e3c11925 100644 --- a/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/ReplyResource.java +++ b/questionReply/questionReply-war/src/main/java/org/silverpeas/components/questionreply/web/ReplyResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.questionreply.web; diff --git a/questionReply/questionReply-war/src/main/webapp/WEB-INF/web.xml b/questionReply/questionReply-war/src/main/webapp/WEB-INF/web.xml index 5973ea2f0d..b9bc8a2979 100644 --- a/questionReply/questionReply-war/src/main/webapp/WEB-INF/web.xml +++ b/questionReply/questionReply-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addQ.jsp b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addQ.jsp index 4a99bad5ee..9ab88fe320 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addQ.jsp +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addQ.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.node.model.NodeDetail" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addQR.jsp b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addQR.jsp index c6d014af03..37906ca4ed 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addQR.jsp +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addQR.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.node.model.NodeDetail" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" %> diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addR.jsp b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addR.jsp index ba38e9bd32..e593a1112d 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addR.jsp +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/addR.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" %> diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/attachmentManager.jsp b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/attachmentManager.jsp index cbe0b51c47..0ae63bacdd 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/attachmentManager.jsp +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/attachmentManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/checkQuestionReply.jsp b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/checkQuestionReply.jsp index 1830f5c86f..38e6519748 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/checkQuestionReply.jsp +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/checkQuestionReply.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/downloadZip.jsp b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/downloadZip.jsp index 5cd3787afc..19c9478c0d 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/downloadZip.jsp +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/downloadZip.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/listQuestionsDHTML.jsp b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/listQuestionsDHTML.jsp index 6dc3b61222..ed26591457 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/listQuestionsDHTML.jsp +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/listQuestionsDHTML.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -504,7 +504,7 @@ function addCategory() { function updateCategory(id) { document.categoryForm.action = "UpdateCategory"; document.categoryForm.CategoryId.value = id; - $("#addOrUpdateCategory #categoryName").val($('#c'+id+" a.categoryTitle").text()); + $("#addOrUpdateCategory #categoryName").val($("#c"+id+" h3").text()); $("#addOrUpdateCategory #categoryDescription").val($('#c'+id+" .categoryDescription").text()); // open modal dialog $('#addOrUpdateCategory').popup('validation', { @@ -796,4 +796,4 @@ out.println(window.printAfter()); var myapp = angular.module('silverpeas.questionReply', ['silverpeas.services', 'silverpeas.directives']); </script> </body> -</html> \ No newline at end of file +</html> diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/portlet.jsp b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/portlet.jsp index 233ac314a6..27c4a421d5 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/portlet.jsp +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/styleSheets/questionReply.css b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/styleSheets/questionReply.css index 477c2c5ec1..bda3c2191e 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/styleSheets/questionReply.css +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/styleSheets/questionReply.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ .hautFrame form > ul, diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/updateQ.jsp b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/updateQ.jsp index 5bcdad98f7..573d611ecf 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/updateQ.jsp +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/updateQ.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/updateR.jsp b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/updateR.jsp index c2b404695f..b8e001c59d 100644 --- a/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/updateR.jsp +++ b/questionReply/questionReply-war/src/main/webapp/questionReply/jsp/updateR.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" %> diff --git a/quickinfo/pom.xml b/quickinfo/pom.xml index 46169a2082..78658fac72 100644 --- a/quickinfo/pom.xml +++ b/quickinfo/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/quickinfo/quickinfo-configuration/pom.xml b/quickinfo/quickinfo-configuration/pom.xml index a4a8289fe2..64fefc1a44 100644 --- a/quickinfo/quickinfo-configuration/pom.xml +++ b/quickinfo/quickinfo-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>quickinfo</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.quickinfo</groupId> diff --git a/quickinfo/quickinfo-configuration/src/main/config/migrations/modules/quickinfo-migration.xml b/quickinfo/quickinfo-configuration/src/main/config/migrations/modules/quickinfo-migration.xml index 976433ad46..869afeac10 100644 --- a/quickinfo/quickinfo-configuration/src/main/config/migrations/modules/quickinfo-migration.xml +++ b/quickinfo/quickinfo-configuration/src/main/config/migrations/modules/quickinfo-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="quickinfo" xmlns="http://silverpeas.org/xml/ns/migration" diff --git a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo.properties b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo.properties index e4af8e2054..e297444b45 100644 --- a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo.properties +++ b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # actions diff --git a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_de.properties b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_de.properties index 5d2e307fe7..dc915d86f2 100644 --- a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_de.properties +++ b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # actions diff --git a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_en.properties b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_en.properties index b3b335d5e9..8e7e9b43df 100644 --- a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_en.properties +++ b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # actions diff --git a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_fr.properties b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_fr.properties index f4873e643e..1c10d42159 100644 --- a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_fr.properties +++ b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/multilang/quickinfo_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # actions diff --git a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/settings/quickInfoSettings.properties b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/settings/quickInfoSettings.properties index 84b1baff17..2d84c62d7e 100644 --- a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/settings/quickInfoSettings.properties +++ b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/quickinfo/settings/quickInfoSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # mandatoryFieldIcon = ../../util/icons/mandatoryField.gif diff --git a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/util/logging/quickinfoLogging.properties b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/util/logging/quickinfoLogging.properties index d0bc854615..2bdb5d8973 100644 --- a/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/util/logging/quickinfoLogging.properties +++ b/quickinfo/quickinfo-configuration/src/main/config/properties/org/silverpeas/util/logging/quickinfoLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/quickinfo/quickinfo-configuration/src/main/config/xmlcomponents/quickinfo.xml b/quickinfo/quickinfo-configuration/src/main/config/xmlcomponents/quickinfo.xml index 4f01928145..3539cdd894 100644 --- a/quickinfo/quickinfo-configuration/src/main/config/xmlcomponents/quickinfo.xml +++ b/quickinfo/quickinfo-configuration/src/main/config/xmlcomponents/quickinfo.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/quickinfo/quickinfo-library/pom.xml b/quickinfo/quickinfo-library/pom.xml index 3ef031e2cb..67348b1002 100644 --- a/quickinfo/quickinfo-library/pom.xml +++ b/quickinfo/quickinfo-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>quickinfo</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.quickinfo</groupId> diff --git a/quickinfo/quickinfo-library/src/integration-test/resources/arquillian.xml b/quickinfo/quickinfo-library/src/integration-test/resources/arquillian.xml index fc68726bc5..ebca1fdd1e 100644 --- a/quickinfo/quickinfo-library/src/integration-test/resources/arquillian.xml +++ b/quickinfo/quickinfo-library/src/integration-test/resources/arquillian.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <arquillian xmlns="http://jboss.org/schema/arquillian" @@ -37,8 +37,8 @@ <container qualifier="wildfly-managed" default="true"> <configuration> <property name="serverConfig">standalone-full.xml</property> - <property name="startupTimeoutInSeconds">120</property> - <property name="allowConnectingToRunningServer">true</property> + <property name="startupTimeoutInSeconds">300</property> + <property name="allowConnectingToRunningServer">false</property> <property name="javaVmArguments">-Xms512M -Xmx2G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</property> <!-- uncomment it for debugging integration test --> <!-- @@ -46,4 +46,4 @@ --> </configuration> </container> -</arquillian> \ No newline at end of file +</arquillian> diff --git a/quickinfo/quickinfo-library/src/integration-test/resources/test-ds.xml b/quickinfo/quickinfo-library/src/integration-test/resources/test-ds.xml index eaddc0bfad..55db3df229 100644 --- a/quickinfo/quickinfo-library/src/integration-test/resources/test-ds.xml +++ b/quickinfo/quickinfo-library/src/integration-test/resources/test-ds.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <datasources xmlns="http://www.jboss.org/ironjacamar/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/NewsByStatus.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/NewsByStatus.java index bd77547e9e..7c4f3dfbad 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/NewsByStatus.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/NewsByStatus.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoComponentSettings.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoComponentSettings.java index 056864852e..0ed818b7ee 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoComponentSettings.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoComponentSettings.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoGlobalSilverpeasContentProcessor.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoGlobalSilverpeasContentProcessor.java index d5e87fb9af..a0816fe754 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoGlobalSilverpeasContentProcessor.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoGlobalSilverpeasContentProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoUserAuthenticationListener.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoUserAuthenticationListener.java index 9b26b17b9e..9888074baa 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoUserAuthenticationListener.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickInfoUserAuthenticationListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickinfoInstancePreDestruction.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickinfoInstancePreDestruction.java index bb7321829f..15d376125d 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickinfoInstancePreDestruction.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/QuickinfoInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/DefaultQuickInfoService.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/DefaultQuickInfoService.java index a217a16035..f34acc5477 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/DefaultQuickInfoService.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/DefaultQuickInfoService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.model; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/News.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/News.java index 1308046be8..0b476c3357 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/News.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/News.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.model; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/NewsModel.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/NewsModel.java index 022df96d5c..c6dc52cbbd 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/NewsModel.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/NewsModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.model; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/NewsPK.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/NewsPK.java index 74b250cfa3..915542faa2 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/NewsPK.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/NewsPK.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.model; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoInstanceContributionManager.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoInstanceContributionManager.java index 320535ba98..94171089dc 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoInstanceContributionManager.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoInstanceContributionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.model; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoService.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoService.java index c46f5ce49f..4a97236200 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoService.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.model; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoServiceProvider.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoServiceProvider.java index 014f869adf..b2b6783c37 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoServiceProvider.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/model/QuickInfoServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.model; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/AbstractNewsUserNotification.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/AbstractNewsUserNotification.java index 977af4cd3b..d2ad248a21 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/AbstractNewsUserNotification.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/AbstractNewsUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.notification; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/AbstractQuickInfoUserNotification.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/AbstractQuickInfoUserNotification.java index edd02d0c08..570803b17b 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/AbstractQuickInfoUserNotification.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/AbstractQuickInfoUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.notification; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsEvent.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsEvent.java index 5d5dc2a5ea..0b50e13f32 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsEvent.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.notification; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsEventNotifier.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsEventNotifier.java index 15878d38d2..341304c35c 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsEventNotifier.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsEventNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.notification; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsManualUserNotification.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsManualUserNotification.java index dd846d17ac..f7ffffb6df 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsManualUserNotification.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/NewsManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.notification; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoDelayedVisibilityUserNotificationReminder.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoDelayedVisibilityUserNotificationReminder.java index 48580b0540..fdb1795efa 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoDelayedVisibilityUserNotificationReminder.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoDelayedVisibilityUserNotificationReminder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.notification; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoDelayedVisibilityUserNotificationReminderInitializer.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoDelayedVisibilityUserNotificationReminderInitializer.java index 2605e58d87..73423b6e61 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoDelayedVisibilityUserNotificationReminderInitializer.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoDelayedVisibilityUserNotificationReminderInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.notification; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoSubscriptionUserNotification.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoSubscriptionUserNotification.java index a650ebd161..76189b9d1b 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoSubscriptionUserNotification.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickInfoSubscriptionUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.notification; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickinfoInstanceManualUserNotification.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickinfoInstanceManualUserNotification.java index 59e41b3b8c..149f8e6664 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickinfoInstanceManualUserNotification.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/notification/QuickinfoInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.notification; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/repository/NewsRepository.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/repository/NewsRepository.java index 2d05ceedec..a39bfbf846 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/repository/NewsRepository.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/repository/NewsRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.repository; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickInfoContentManager.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickInfoContentManager.java index 6e8c94c422..ed1f2cd133 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickInfoContentManager.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickInfoContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.service; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickInfoDateComparatorDesc.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickInfoDateComparatorDesc.java index 6d5f2efca2..3e0d719ed9 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickInfoDateComparatorDesc.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickInfoDateComparatorDesc.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.service; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickinfoStatistics.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickinfoStatistics.java index a2fff80256..c80dc4571d 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickinfoStatistics.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/service/QuickinfoStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.service; diff --git a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/socialnetwork/SocialQuickInfoComment.java b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/socialnetwork/SocialQuickInfoComment.java index 059b8ce866..cca74a08f2 100644 --- a/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/socialnetwork/SocialQuickInfoComment.java +++ b/quickinfo/quickinfo-library/src/main/java/org/silverpeas/components/quickinfo/socialnetwork/SocialQuickInfoComment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.socialnetwork; diff --git a/quickinfo/quickinfo-war/pom.xml b/quickinfo/quickinfo-war/pom.xml index c95963fc86..567dbda908 100644 --- a/quickinfo/quickinfo-war/pom.xml +++ b/quickinfo/quickinfo-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>quickinfo</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.quickinfo</groupId> diff --git a/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/QuickinfoIndexer.java b/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/QuickinfoIndexer.java index d36cbbfa8d..31657f9db0 100644 --- a/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/QuickinfoIndexer.java +++ b/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/QuickinfoIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo; diff --git a/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/control/QuickInfoSessionController.java b/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/control/QuickInfoSessionController.java index 6dc11c8b88..979e50e552 100644 --- a/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/control/QuickInfoSessionController.java +++ b/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/control/QuickInfoSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.control; diff --git a/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/portlets/QuickInfosPortlet.java b/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/portlets/QuickInfosPortlet.java index 9fc6060d13..d0084b0497 100644 --- a/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/portlets/QuickInfosPortlet.java +++ b/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/portlets/QuickInfosPortlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.portlets; diff --git a/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/servlets/QuickInfoRequestRouter.java b/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/servlets/QuickInfoRequestRouter.java index d8d3de620a..9bd410f4be 100644 --- a/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/servlets/QuickInfoRequestRouter.java +++ b/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/servlets/QuickInfoRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.servlets; diff --git a/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/web/NewsEntity.java b/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/web/NewsEntity.java index de4866d153..7afb224f32 100644 --- a/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/web/NewsEntity.java +++ b/quickinfo/quickinfo-war/src/main/java/org/silverpeas/components/quickinfo/web/NewsEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quickinfo.web; diff --git a/quickinfo/quickinfo-war/src/main/webapp/WEB-INF/tags/silverpeas/quickinfo/portletNews.tag b/quickinfo/quickinfo-war/src/main/webapp/WEB-INF/tags/silverpeas/quickinfo/portletNews.tag index 6fc9b8cade..5cd03bbf6a 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/WEB-INF/tags/silverpeas/quickinfo/portletNews.tag +++ b/quickinfo/quickinfo-war/src/main/webapp/WEB-INF/tags/silverpeas/quickinfo/portletNews.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/quickinfo/quickinfo-war/src/main/webapp/WEB-INF/web.xml b/quickinfo/quickinfo-war/src/main/webapp/WEB-INF/web.xml index 6141e8e3fd..7c076c6029 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/WEB-INF/web.xml +++ b/quickinfo/quickinfo-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/edit.jsp b/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/edit.jsp index 7535aad31d..cd6718c6b1 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/edit.jsp +++ b/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/edit.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/help.jsp b/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/help.jsp index 1b352538f5..2d09817621 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/help.jsp +++ b/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/help.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/portlet.jsp b/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/portlet.jsp index b432e98d70..8367a39f19 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/portlet.jsp +++ b/quickinfo/quickinfo-war/src/main/webapp/portlets/jsp/quickInfos/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/blockingNews.jsp b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/blockingNews.jsp index 65eeff75bb..335aadd0e8 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/blockingNews.jsp +++ b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/blockingNews.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/checkQuickInfo.jsp b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/checkQuickInfo.jsp index d38a014a55..ddb44f94f8 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/checkQuickInfo.jsp +++ b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/checkQuickInfo.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/home.jsp b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/home.jsp index f3cb5e14ec..423beef23e 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/home.jsp +++ b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/home.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/news.jsp b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/news.jsp index 948bc6e571..9f075b62e9 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/news.jsp +++ b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/news.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.quickinfo.model.News"%> diff --git a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/quickInfoEdit.jsp b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/quickInfoEdit.jsp index 5cdad06d8a..1019188d78 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/quickInfoEdit.jsp +++ b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/quickInfoEdit.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.io.media.image.thumbnail.model.ThumbnailDetail"%> diff --git a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/styleSheets/quickinfo.css b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/styleSheets/quickinfo.css index c661fefa04..67e89d5c58 100644 --- a/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/styleSheets/quickinfo.css +++ b/quickinfo/quickinfo-war/src/main/webapp/quickinfo/jsp/styleSheets/quickinfo.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /*** home***/ diff --git a/quizz/pom.xml b/quizz/pom.xml index d350d39cb9..62937666aa 100644 --- a/quizz/pom.xml +++ b/quizz/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/quizz/quizz-configuration/pom.xml b/quizz/quizz-configuration/pom.xml index 324773ec1e..b6eba0d3f1 100644 --- a/quizz/quizz-configuration/pom.xml +++ b/quizz/quizz-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>quizz</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.quizz</groupId> diff --git a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz.properties b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz.properties index 282ad80009..890acc970f 100644 --- a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz.properties +++ b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # QuizzCredits = Cr\u00e9dits QuizzCreationDate = Date de cr\u00e9ation diff --git a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_de.properties b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_de.properties index 00564834ca..58e3a6018c 100644 --- a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_de.properties +++ b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # QuizzCredits = Kredit-Punkte QuizzCreationDate = Erstellungsdatum diff --git a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_en.properties b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_en.properties index 68eb809623..19c75df02c 100644 --- a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_en.properties +++ b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # QuizzCredits = Credits QuizzCreationDate = Created diff --git a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_fr.properties b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_fr.properties index aa84eeb8f3..bd0fc2bf12 100644 --- a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_fr.properties +++ b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/multilang/quizz_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # QuizzCredits = Cr\u00e9dits QuizzCreationDate = Date de cr\u00e9ation diff --git a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/quizzSettings.properties b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/quizzSettings.properties index 95a4953d91..78bc36d461 100644 --- a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/quizzSettings.properties +++ b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/quizz/quizzSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # imagesSubDirectory = images nbTopScores = 3 diff --git a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/util/logging/quizzLogging.properties b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/util/logging/quizzLogging.properties index 9ac33e9639..8daf4c8e2f 100644 --- a/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/util/logging/quizzLogging.properties +++ b/quizz/quizz-configuration/src/main/config/properties/org/silverpeas/util/logging/quizzLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/quizz/quizz-configuration/src/main/config/xmlcomponents/quizz.xml b/quizz/quizz-configuration/src/main/config/xmlcomponents/quizz.xml index 4cea2a24aa..9fd170b0c3 100644 --- a/quizz/quizz-configuration/src/main/config/xmlcomponents/quizz.xml +++ b/quizz/quizz-configuration/src/main/config/xmlcomponents/quizz.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/quizz/quizz-library/pom.xml b/quizz/quizz-library/pom.xml index b77329a49e..3bcc399882 100644 --- a/quizz/quizz-library/pom.xml +++ b/quizz/quizz-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>quizz</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.quizz</groupId> diff --git a/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzContentManager.java b/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzContentManager.java index 600bbc7b14..5ed74cb6f2 100644 --- a/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzContentManager.java +++ b/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quizz; diff --git a/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzException.java b/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzException.java index 41c7a55439..5f982a16c0 100644 --- a/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzException.java +++ b/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quizz; diff --git a/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzStatistics.java b/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzStatistics.java index 5a4673340c..9738c66f47 100644 --- a/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzStatistics.java +++ b/quizz/quizz-library/src/main/java/org/silverpeas/components/quizz/QuizzStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quizz; diff --git a/quizz/quizz-war/pom.xml b/quizz/quizz-war/pom.xml index 4022358dce..1b2d5aec86 100644 --- a/quizz/quizz-war/pom.xml +++ b/quizz/quizz-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>quizz</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.quizz</groupId> diff --git a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuestionForm.java b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuestionForm.java index 6961a148b3..af79669790 100644 --- a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuestionForm.java +++ b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuestionForm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quizz; diff --git a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuestionHelper.java b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuestionHelper.java index c3869d1257..7da19228a0 100644 --- a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuestionHelper.java +++ b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuestionHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quizz; diff --git a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuizzIndexer.java b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuizzIndexer.java index def6c95c1f..d262d9b9e1 100644 --- a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuizzIndexer.java +++ b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/QuizzIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quizz; diff --git a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/control/QuizzSessionController.java b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/control/QuizzSessionController.java index 4990fa453c..eb76c32926 100644 --- a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/control/QuizzSessionController.java +++ b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/control/QuizzSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quizz.control; @@ -543,6 +543,7 @@ public boolean isPdcUsed() { public void copySurvey(String quizzId) throws ClipboardException, QuizzException { QuestionContainerDetail quizz = getQuizzDetail(quizzId); QuestionContainerSelection questionContainerSelect = new QuestionContainerSelection(quizz); + addClipboardSelection(questionContainerSelect); } public void paste() throws Exception { diff --git a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/servlets/GoToQuizz.java b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/servlets/GoToQuizz.java index 1b8584e6de..14f7deee97 100644 --- a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/servlets/GoToQuizz.java +++ b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/servlets/GoToQuizz.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quizz.servlets; diff --git a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/servlets/QuizzRequestRouter.java b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/servlets/QuizzRequestRouter.java index f0d23948a3..ec53e15b26 100644 --- a/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/servlets/QuizzRequestRouter.java +++ b/quizz/quizz-war/src/main/java/org/silverpeas/components/quizz/servlets/QuizzRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.quizz.servlets; diff --git a/quizz/quizz-war/src/main/webapp/WEB-INF/web.xml b/quizz/quizz-war/src/main/webapp/WEB-INF/web.xml index ed35af6b21..0de98c96fb 100644 --- a/quizz/quizz-war/src/main/webapp/WEB-INF/web.xml +++ b/quizz/quizz-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/checkQuizz.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/checkQuizz.jsp index 09fed5a1cc..fe4509f207 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/checkQuizz.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/checkQuizz.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/deleteQuizz.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/deleteQuizz.jsp index 9dd5c76b53..1291cf195b 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/deleteQuizz.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/deleteQuizz.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/palmares.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/palmares.jsp index c69adaa3db..626e06a8cd 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/palmares.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/palmares.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.util.WebEncodeHelper" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/palmaresAdmin.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/palmaresAdmin.jsp index 03df9256a2..399bef97ce 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/palmaresAdmin.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/palmaresAdmin.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreator.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreator.jsp index 01fa3863e9..2d175f2eb0 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreator.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreator.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreatorBis.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreatorBis.jsp index 15e4a9c63d..312ec42a5a 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreatorBis.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/questionCreatorBis.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/questionsUpdate.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/questionsUpdate.jsp index 4997408c55..ff18a7ffb5 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/questionsUpdate.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/questionsUpdate.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzAdmin.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzAdmin.jsp index 3197792c9f..cf5fb5a54a 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzAdmin.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzAdmin.jsp @@ -3,7 +3,7 @@ <%@ page import="java.net.URLEncoder" %> <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -15,7 +15,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,7 +23,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> @@ -89,12 +89,6 @@ function deleteQuizz(quizz_id) if (rep==true) self.location="deleteQuizz.jsp?quizz_id="+quizz_id } - -function clipboardPaste() { - top.IdleFrame.document.location.replace('../..<%=URLUtil.getURL(URLUtil.CMP_CLIPBOARD)%>paste?compR=Rquizz&SpaceFrom=<%=quizzScc.getSpaceId()%>&ComponentFrom=<%=quizzScc.getComponentId()%>&JSPPage=<%=response.encodeURL(URLEncoder.encode("Main"))%>&TargetFrame=MyMain&message=REFRESH'); - // forcer le rafraichissmeent de la page - document.location.reload(); -} </script> </head> <body> @@ -125,7 +119,7 @@ function clipboardPaste() { if (isAdmin) { operationPane.addOperation(resources.getIcon("quizz.paste"), resources.getString("GML.paste"), - "javascript:onClick=clipboardPaste()"); + "paste"); } out.println(window.printBefore()); %> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzClue.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzClue.jsp index df2c61b898..24013746c7 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzClue.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzClue.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzCluePreview.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzCluePreview.jsp index 7bf8f9a25d..18a2c516a8 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzCluePreview.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzCluePreview.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzCreator.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzCreator.jsp index 0842c3c9c7..1b328b6c8c 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzCreator.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzCreator.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzPortlet.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzPortlet.jsp index 20dcb38bfd..0d963f655f 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzPortlet.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzPortlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzQuestions.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzQuestions.jsp index 0d2a6e5fdb..eb382dd14e 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzQuestions.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzQuestions.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzQuestionsNew.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzQuestionsNew.jsp index bdc09d003b..a755990dd6 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzQuestionsNew.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzQuestionsNew.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> @@ -212,7 +212,6 @@ String displayQuestion(QuizzSessionController quizzScc, Question question, int i r += " "; r += "</table>"; r += board.printAfter(); - r += "<br>"; r += board.printBefore(); r += "<table width=\"98%\" border=\"0\" cellspacing=\"0\" cellpadding=\"3\" >"; @@ -495,7 +494,7 @@ String displayQuestionPreview(Question question, int i, String m_context, QuizzS else r += " "; r += "</td></tr></table>"; - r += "</table><br>"; + r += board.printAfter(); r += board.printBefore(); r += "<table width=\"98%\" border=\"0\" cellspacing=\"0\" cellpadding=\"3\" >"; @@ -512,6 +511,7 @@ String displayQuestionPreview(Question question, int i, String m_context, QuizzS r += "<option name=\"answer_"+i+"\" value=\"\">"+WebEncodeHelper.javaStringToHtmlString(answer.getLabel())+"</option>"; } + r += "</select>"; r += "</td></tr>"; } else @@ -546,9 +546,10 @@ String displayQuestionPreview(Question question, int i, String m_context, QuizzS } r += "<td width=\"40px\" align=\"center\"><input type=\""+inputType+"\" name=\"answer_"+i+"\"></td><td align=\"left\" width=\"100%\">"+Encode.javaStringToHtmlString(answer.getLabel())+"<BR>"; r += "</tr></table>"; + r += "</td></tr>"; } } - r += board.printAfter(); + r += "</table>"; r += board.printAfter(); return r; } diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzResultAdmin.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzResultAdmin.jsp index 4dafba7dab..0d97c9c1ab 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzResultAdmin.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzResultAdmin.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzResultUser.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzResultUser.jsp index 40429c6af1..fe6455a792 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzResultUser.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzResultUser.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUpdate.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUpdate.jsp index 1e397ee577..c80e9b4457 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUpdate.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUpdate.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUser.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUser.jsp index cd50322b5e..2e273856c2 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUser.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUser.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUserPortlet.jsp b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUserPortlet.jsp index 4e67823189..d68097311e 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUserPortlet.jsp +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/quizzUserPortlet.jsp @@ -2,7 +2,7 @@ <%@ page import="org.silverpeas.core.web.util.viewgenerator.html.frame.Frame" %> <%@ page import="org.silverpeas.core.web.util.viewgenerator.html.window.Window" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -14,7 +14,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +22,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/globalSP.css b/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/globalSP.css index 0d253e8ec7..7ce2bc8a90 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/globalSP.css +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/globalSP.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ <!-- diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/globalSPAdmin.css b/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/globalSPAdmin.css index 2430895f1d..ac471d9430 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/globalSPAdmin.css +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/globalSPAdmin.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ <!-- diff --git a/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/quizz.css b/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/quizz.css index 32370e1d56..768a3fea8a 100644 --- a/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/quizz.css +++ b/quizz/quizz-war/src/main/webapp/quizz/jsp/styleSheets/quizz.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ label { diff --git a/resourcesManager/pom.xml b/resourcesManager/pom.xml index 7f1236a1bb..ef1bd29762 100644 --- a/resourcesManager/pom.xml +++ b/resourcesManager/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/resourcesManager/resourcesManager-configuration/pom.xml b/resourcesManager/resourcesManager-configuration/pom.xml index 788ea697e5..d202b8f130 100644 --- a/resourcesManager/resourcesManager-configuration/pom.xml +++ b/resourcesManager/resourcesManager-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>resourcesmanager</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.resourcesmanager</groupId> diff --git a/resourcesManager/resourcesManager-configuration/src/main/config/migrations/modules/resourcesManager-migration.xml b/resourcesManager/resourcesManager-configuration/src/main/config/migrations/modules/resourcesManager-migration.xml index b2ac808f43..12a50198ed 100644 --- a/resourcesManager/resourcesManager-configuration/src/main/config/migrations/modules/resourcesManager-migration.xml +++ b/resourcesManager/resourcesManager-configuration/src/main/config/migrations/modules/resourcesManager-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="resourcesManager" diff --git a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle.properties b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle.properties index e0efda4e9a..6993569a36 100644 --- a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle.properties +++ b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # resourcesManager.accueil = Planning des r\u00e9servations resourcesManager.categorie = Cat\u00e9gorie diff --git a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_de.properties b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_de.properties index 868f3a2993..9d60edfd7e 100644 --- a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_de.properties +++ b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # resourcesManager.accueil = Zeitplan resourcesManager.categorie = Kategorie diff --git a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_en.properties b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_en.properties index 6cc3456e09..77122baf87 100644 --- a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_en.properties +++ b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # resourcesManager.accueil = Reservations resourcesManager.categorie = Category diff --git a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_fr.properties b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_fr.properties index aea6328762..965bbd214e 100644 --- a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_fr.properties +++ b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/multilang/resourcesManagerBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # resourcesManager.accueil = Planning des r\u00e9servations resourcesManager.categorie = Cat\u00e9gorie diff --git a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/settings/resourcesManagerIcons.properties b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/settings/resourcesManagerIcons.properties index 42ff921e88..87244d42f3 100644 --- a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/settings/resourcesManagerIcons.properties +++ b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/resourcesmanager/settings/resourcesManagerIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # resourcesManager.logo = /resourcesManager/jsp/icons/logo.gif diff --git a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/util/logging/resourcesManagerLogging.properties b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/util/logging/resourcesManagerLogging.properties index b1ab7fe669..71a7826ece 100644 --- a/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/util/logging/resourcesManagerLogging.properties +++ b/resourcesManager/resourcesManager-configuration/src/main/config/properties/org/silverpeas/util/logging/resourcesManagerLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/resourcesManager/resourcesManager-configuration/src/main/config/xmlcomponents/resourcesManager.xml b/resourcesManager/resourcesManager-configuration/src/main/config/xmlcomponents/resourcesManager.xml index f27056595a..e3f0838ff8 100644 --- a/resourcesManager/resourcesManager-configuration/src/main/config/xmlcomponents/resourcesManager.xml +++ b/resourcesManager/resourcesManager-configuration/src/main/config/xmlcomponents/resourcesManager.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/resourcesManager/resourcesManager-library/pom.xml b/resourcesManager/resourcesManager-library/pom.xml index f743e30f6d..587aff49f9 100644 --- a/resourcesManager/resourcesManager-library/pom.xml +++ b/resourcesManager/resourcesManager-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>resourcesmanager</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.resourcesmanager</groupId> diff --git a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/ResourcesManagerInstancePreDestructionIT.java b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/ResourcesManagerInstancePreDestructionIT.java index d76fed1475..22b458408c 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/ResourcesManagerInstancePreDestructionIT.java +++ b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/ResourcesManagerInstancePreDestructionIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager; diff --git a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceRepositoryIT.java b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceRepositoryIT.java index 9a46539c32..d75f7a7110 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceRepositoryIT.java +++ b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceRepositoryIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorRepositoryIT.java b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorRepositoryIT.java index fd45d1fa6e..72e80ed686 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorRepositoryIT.java +++ b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorRepositoryIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/CategoryMatcher.java b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/CategoryMatcher.java index 5d586bf7bb..7c715d317b 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/CategoryMatcher.java +++ b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/CategoryMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/CategoryServiceIT.java b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/CategoryServiceIT.java index 54b594333d..8603bb84d4 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/CategoryServiceIT.java +++ b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/CategoryServiceIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ReservationServiceIT.java b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ReservationServiceIT.java index 0534a2514e..54ce4ae76c 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ReservationServiceIT.java +++ b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ReservationServiceIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ReservedResourceServiceIT.java b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ReservedResourceServiceIT.java index 7e487f3f02..5b80ce3c4a 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ReservedResourceServiceIT.java +++ b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ReservedResourceServiceIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ResourceServiceIT.java b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ResourceServiceIT.java index fe59831bb5..adc7238a76 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ResourceServiceIT.java +++ b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/service/ResourceServiceIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/test/WarBuilder4ResourcesManager.java b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/test/WarBuilder4ResourcesManager.java index f514b81b27..aebbff30d3 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/test/WarBuilder4ResourcesManager.java +++ b/resourcesManager/resourcesManager-library/src/integration-test/java/org/silverpeas/components/resourcesmanager/test/WarBuilder4ResourcesManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.test; diff --git a/resourcesManager/resourcesManager-library/src/integration-test/resources/arquillian.xml b/resourcesManager/resourcesManager-library/src/integration-test/resources/arquillian.xml index fc68726bc5..ebca1fdd1e 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/resources/arquillian.xml +++ b/resourcesManager/resourcesManager-library/src/integration-test/resources/arquillian.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <arquillian xmlns="http://jboss.org/schema/arquillian" @@ -37,8 +37,8 @@ <container qualifier="wildfly-managed" default="true"> <configuration> <property name="serverConfig">standalone-full.xml</property> - <property name="startupTimeoutInSeconds">120</property> - <property name="allowConnectingToRunningServer">true</property> + <property name="startupTimeoutInSeconds">300</property> + <property name="allowConnectingToRunningServer">false</property> <property name="javaVmArguments">-Xms512M -Xmx2G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</property> <!-- uncomment it for debugging integration test --> <!-- @@ -46,4 +46,4 @@ --> </configuration> </container> -</arquillian> \ No newline at end of file +</arquillian> diff --git a/resourcesManager/resourcesManager-library/src/integration-test/resources/test-ds.xml b/resourcesManager/resourcesManager-library/src/integration-test/resources/test-ds.xml index eaddc0bfad..55db3df229 100644 --- a/resourcesManager/resourcesManager-library/src/integration-test/resources/test-ds.xml +++ b/resourcesManager/resourcesManager-library/src/integration-test/resources/test-ds.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <datasources xmlns="http://www.jboss.org/ironjacamar/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerInstancePreDestruction.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerInstancePreDestruction.java index f1702a8fbb..463afad077 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerInstancePreDestruction.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerProvider.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerProvider.java index 7c6504a00c..9ec8e7d75b 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerProvider.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerStatistics.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerStatistics.java index aaa22836cb..745cc34224 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerStatistics.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Category.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Category.java index 16a8a5f127..a9f718aa5d 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Category.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Category.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.model; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Reservation.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Reservation.java index 5ffe147d53..d56e0c3642 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Reservation.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Reservation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.model; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ReservedResource.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ReservedResource.java index 23485e602f..840bcc352f 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ReservedResource.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ReservedResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.model; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ReservedResourcePk.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ReservedResourcePk.java index 3e24f4ab4c..941acdedfd 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ReservedResourcePk.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ReservedResourcePk.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.model; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Resource.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Resource.java index 45d8f66e10..f74c81bfea 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Resource.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/Resource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.model; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceStatus.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceStatus.java index 003ecc2991..ef4c3f5f1d 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceStatus.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceStatus.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.model; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceValidator.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceValidator.java index 2712b430df..9be873930f 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceValidator.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.model; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceValidatorPk.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceValidatorPk.java index a3bdcd5b06..500d37bf39 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceValidatorPk.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/model/ResourceValidatorPk.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.model; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/CategoryJpaRepository.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/CategoryJpaRepository.java index 177147531f..52ace60ca6 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/CategoryJpaRepository.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/CategoryJpaRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/CategoryRepository.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/CategoryRepository.java index 9c76c0e111..391d25981c 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/CategoryRepository.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/CategoryRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservationJpaManager.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservationJpaManager.java index ec2b7c2d26..761d49cc47 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservationJpaManager.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservationJpaManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservationRepository.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservationRepository.java index 81989323cf..9ff3a8d919 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservationRepository.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservationRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General License as @@ -19,7 +19,7 @@ * GNU Affero General License for more details. * * You should have received a copy of the GNU Affero General License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceJpaRepository.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceJpaRepository.java index 2881ef2c3e..083ee22620 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceJpaRepository.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceJpaRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceRepository.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceRepository.java index aa2f3a2fcc..4c515433d8 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceRepository.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ReservedResourceRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceJpaRepository.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceJpaRepository.java index 294916de9a..6c2cebab1e 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceJpaRepository.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceJpaRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceRepository.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceRepository.java index db7753ebdf..ff3f54ada3 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceRepository.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorJpaRepository.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorJpaRepository.java index effa3ff9c3..e394440208 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorJpaRepository.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorJpaRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorRepository.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorRepository.java index 9dda798de3..b17a3d1334 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorRepository.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/repository/ResourceValidatorRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.repository; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/CategoryService.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/CategoryService.java index 1777035ebf..08c41582b9 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/CategoryService.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/CategoryService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ReservationService.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ReservationService.java index 448b53ddaa..130391b20f 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ReservationService.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ReservationService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ReservedResourceService.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ReservedResourceService.java index 94a6343a83..c709af88a8 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ReservedResourceService.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ReservedResourceService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourceService.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourceService.java index 8e202a62d3..7877541b9f 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourceService.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourceService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourcesManager.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourcesManager.java index f77dd23814..1b5db36ae1 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourcesManager.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourcesManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourcesManagerRuntimeException.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourcesManagerRuntimeException.java index 30ac54e7ec..244992ee0a 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourcesManagerRuntimeException.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/ResourcesManagerRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/SimpleResourcesManager.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/SimpleResourcesManager.java index 34969f748d..1593b3cf72 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/SimpleResourcesManager.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/service/SimpleResourcesManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.service; diff --git a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/util/ResourceUtil.java b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/util/ResourceUtil.java index 11f8588dc6..8f87d52718 100644 --- a/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/util/ResourceUtil.java +++ b/resourcesManager/resourcesManager-library/src/main/java/org/silverpeas/components/resourcesmanager/util/ResourceUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.util; diff --git a/resourcesManager/resourcesManager-war/pom.xml b/resourcesManager/resourcesManager-war/pom.xml index a3e9922957..6349c81d33 100644 --- a/resourcesManager/resourcesManager-war/pom.xml +++ b/resourcesManager/resourcesManager-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>resourcesmanager</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.resourcesmanager</groupId> diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerIndexer.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerIndexer.java index 896be92453..3728ac2da3 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerIndexer.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/ResourcesManagerIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ReservationTimeWindowViewContext.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ReservationTimeWindowViewContext.java index 53b581a967..e45b703e0a 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ReservationTimeWindowViewContext.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ReservationTimeWindowViewContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.control; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ResourceManagerDataViewType.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ResourceManagerDataViewType.java index 18204aa592..fb960ce043 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ResourceManagerDataViewType.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ResourceManagerDataViewType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.control; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ResourcesManagerSessionController.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ResourcesManagerSessionController.java index 41b758a1c3..0bb9e924eb 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ResourcesManagerSessionController.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/control/ResourcesManagerSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.control; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/servlets/AjaxResourcesManagerServlet.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/servlets/AjaxResourcesManagerServlet.java index 2c21102efe..b6597a615e 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/servlets/AjaxResourcesManagerServlet.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/servlets/AjaxResourcesManagerServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.servlets; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/servlets/ResourcesManagerRequestRouter.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/servlets/ResourcesManagerRequestRouter.java index 7d68fa9976..d619f7bfe9 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/servlets/ResourcesManagerRequestRouter.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/servlets/ResourcesManagerRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.servlets; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/AbstractResourceManagerResource.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/AbstractResourceManagerResource.java index c1faa37e76..62334a111b 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/AbstractResourceManagerResource.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/AbstractResourceManagerResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.web; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ReservationEntity.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ReservationEntity.java index 69a8006128..ce990863a2 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ReservationEntity.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ReservationEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.web; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ReservedResourceEntity.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ReservedResourceEntity.java index c93c2b311f..e6515e92c4 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ReservedResourceEntity.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ReservedResourceEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.web; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceCategoryEntity.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceCategoryEntity.java index a9ba210d24..3c6f28d7ee 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceCategoryEntity.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceCategoryEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.web; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceEntity.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceEntity.java index 81307903a4..bf8d6e1cf6 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceEntity.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.web; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceManagerResource.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceManagerResource.java index a2cbba2c21..e02dac6e10 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceManagerResource.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceManagerResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.web; diff --git a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceManagerResourceURIs.java b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceManagerResourceURIs.java index ad3b45bbcb..b7f98af704 100644 --- a/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceManagerResourceURIs.java +++ b/resourcesManager/resourcesManager-war/src/main/java/org/silverpeas/components/resourcesmanager/web/ResourceManagerResourceURIs.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.resourcesmanager.web; diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/WEB-INF/web.xml b/resourcesManager/resourcesManager-war/src/main/webapp/WEB-INF/web.xml index 32007eae77..aafc82cc2e 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/WEB-INF/web.xml +++ b/resourcesManager/resourcesManager-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/almanach.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/almanach.jsp index 2dafe4fd2f..d242ecd6f4 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/almanach.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/almanach.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/cart.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/cart.jsp index 3fb87883cb..eb31cd5440 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/cart.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/cart.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/categories.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/categories.jsp index 6ebdd21adf..04e58ec510 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/categories.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/categories.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/categoryManager.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/categoryManager.jsp index 172cfaa96d..1e90426df4 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/categoryManager.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/categoryManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/check.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/check.jsp index e03aefbdeb..28cfb00787 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/check.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/closeWindow.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/closeWindow.jsp index ae621aca68..85dfad0030 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/closeWindow.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/closeWindow.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/comments.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/comments.jsp index ec7ad12d99..49ea6f7c45 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/comments.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/comments.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/javaScript/resourceManager-calendar.js b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/javaScript/resourceManager-calendar.js index c7024a200b..873aca435f 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/javaScript/resourceManager-calendar.js +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/javaScript/resourceManager-calendar.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /** diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/portlet.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/portlet.jsp index 3b7f598353..0833bbff63 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/portlet.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/refreshFromUserSelect.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/refreshFromUserSelect.jsp index 42d4c3cdde..02d52182d3 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/refreshFromUserSelect.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/refreshFromUserSelect.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/refuseResource.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/refuseResource.jsp index f6cf433966..e614027846 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/refuseResource.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/refuseResource.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/reservationManager.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/reservationManager.jsp index 126d1b3cb4..3f5553daff 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/reservationManager.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/reservationManager.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resource.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resource.jsp index e9febab74f..980f3221aa 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resource.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resource.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resourceManager.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resourceManager.jsp index 9c5f6c171e..90988ccf21 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resourceManager.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resourceManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resources.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resources.jsp index a3f7b4d8d2..8954491066 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resources.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/resources.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/styleSheets/print_resourcesManager.css b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/styleSheets/print_resourcesManager.css index 1318022efe..0b10ebc66b 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/styleSheets/print_resourcesManager.css +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/styleSheets/print_resourcesManager.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ #menubar-creation-actions, .cellOperation, #today, #others p, .milieuOngletOff { diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/styleSheets/resourcesManager.css b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/styleSheets/resourcesManager.css index bd3d4e191e..915fc21362 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/styleSheets/resourcesManager.css +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/styleSheets/resourcesManager.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ #navigation { background-color:#EAEAEA; diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/viewReservation.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/viewReservation.jsp index 86d4826283..a8164c06ee 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/viewReservation.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/viewReservation.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/viewReservations.jsp b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/viewReservations.jsp index cce168a260..98defe86fe 100644 --- a/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/viewReservations.jsp +++ b/resourcesManager/resourcesManager-war/src/main/webapp/resourcesManager/jsp/viewReservations.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/rssAggregator/pom.xml b/rssAggregator/pom.xml index afc75d1dd3..4e49212a5f 100644 --- a/rssAggregator/pom.xml +++ b/rssAggregator/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/rssAggregator/rssAggregator-configuration/pom.xml b/rssAggregator/rssAggregator-configuration/pom.xml index 6f9d46c744..6b79bc96a5 100644 --- a/rssAggregator/rssAggregator-configuration/pom.xml +++ b/rssAggregator/rssAggregator-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>rssaggregator</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.rssaggregator</groupId> diff --git a/rssAggregator/rssAggregator-configuration/src/main/config/migrations/modules/rssAgregator-migration.xml b/rssAggregator/rssAggregator-configuration/src/main/config/migrations/modules/rssAgregator-migration.xml index 196e2385f0..0a8efb1f59 100644 --- a/rssAggregator/rssAggregator-configuration/src/main/config/migrations/modules/rssAgregator-migration.xml +++ b/rssAggregator/rssAggregator-configuration/src/main/config/migrations/modules/rssAgregator-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <migration module="rssAgregator" diff --git a/rssAggregator/rssAggregator-configuration/src/main/config/migrations/scripts/rssAgregator/up002/replaceAggregatedValue.groovy b/rssAggregator/rssAggregator-configuration/src/main/config/migrations/scripts/rssAgregator/up002/replaceAggregatedValue.groovy index cf373faa6f..941ecdaaf0 100644 --- a/rssAggregator/rssAggregator-configuration/src/main/config/migrations/scripts/rssAgregator/up002/replaceAggregatedValue.groovy +++ b/rssAggregator/rssAggregator-configuration/src/main/config/migrations/scripts/rssAgregator/up002/replaceAggregatedValue.groovy @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ import java.sql.SQLException diff --git a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle.properties b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle.properties index 5b9cade4b0..820056690a 100644 --- a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle.properties +++ b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # rss.url = Url rss.nbDisplayedItems = Nb d'items affich\u00e9s diff --git a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_de.properties b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_de.properties index f5953928ec..d642e13f88 100644 --- a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_de.properties +++ b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # rss.url = URL diff --git a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_en.properties b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_en.properties index 412c75b7ea..cb06d8716d 100644 --- a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_en.properties +++ b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # rss.url = Url rss.nbDisplayedItems = # of displayed items diff --git a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_fr.properties b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_fr.properties index d196e54b48..d26dbb304f 100644 --- a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_fr.properties +++ b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/multilang/rssAgregatorBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # rss.url = Url rss.nbDisplayedItems = Nb d'items affich\u00e9s diff --git a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/settings/rssAgregatorIcons.properties b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/settings/rssAgregatorIcons.properties index aa9816f9cb..6508e16da3 100644 --- a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/settings/rssAgregatorIcons.properties +++ b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/settings/rssAgregatorIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # rss.mandatoryField = /util/icons/mandatoryField.gif rss.deleteChannel = /util/icons/delete.gif diff --git a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/settings/rssAgregatorSettings.properties b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/settings/rssAgregatorSettings.properties index f1a30bc3a3..ab47a2ee2d 100644 --- a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/settings/rssAgregatorSettings.properties +++ b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/rssAgregator/settings/rssAgregatorSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # refresh rate in minutes else if return the RSS cache value refreshRate = 20 diff --git a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/util/logging/rssAggregatorLogging.properties b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/util/logging/rssAggregatorLogging.properties index 5e009540c1..1e51c3a3f6 100644 --- a/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/util/logging/rssAggregatorLogging.properties +++ b/rssAggregator/rssAggregator-configuration/src/main/config/properties/org/silverpeas/util/logging/rssAggregatorLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/rssAggregator/rssAggregator-configuration/src/main/config/xmlcomponents/rssAgregator.xml b/rssAggregator/rssAggregator-configuration/src/main/config/xmlcomponents/rssAgregator.xml index 58aa7cd461..507e2fbac4 100644 --- a/rssAggregator/rssAggregator-configuration/src/main/config/xmlcomponents/rssAgregator.xml +++ b/rssAggregator/rssAggregator-configuration/src/main/config/xmlcomponents/rssAgregator.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/rssAggregator/rssAggregator-library/pom.xml b/rssAggregator/rssAggregator-library/pom.xml index 91e9f4dc9e..353f4255ed 100644 --- a/rssAggregator/rssAggregator-library/pom.xml +++ b/rssAggregator/rssAggregator-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>rssaggregator</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.rssaggregator</groupId> diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorInstancePreDestruction.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorInstancePreDestruction.java index 5b68cb9320..7a70bc607d 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorInstancePreDestruction.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorRuntimeException.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorRuntimeException.java index 15e31f6f17..a2a510432d 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorRuntimeException.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorStatistics.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorStatistics.java index 985a142d88..74d9fe79c3 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorStatistics.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/RssAgregatorStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/RSSItem.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/RSSItem.java index 1297e9ff89..84e0f964e1 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/RSSItem.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/RSSItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.model; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/RssAgregatorException.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/RssAgregatorException.java index 3732802c3a..d9df449016 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/RssAgregatorException.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/RssAgregatorException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.model; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/SPChannel.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/SPChannel.java index e1050be7f5..5d6c63fa85 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/SPChannel.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/SPChannel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.model; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/SPChannelPK.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/SPChannelPK.java index d73859e4d6..015e51da87 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/SPChannelPK.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/model/SPChannelPK.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.model; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/DefaultRSSService.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/DefaultRSSService.java index 88ed2b4904..77de9bc816 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/DefaultRSSService.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/DefaultRSSService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.service; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/DefaultRssAggregator.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/DefaultRssAggregator.java index f09d6b1477..9f00b885b9 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/DefaultRssAggregator.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/DefaultRssAggregator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.service; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/FeedComparator.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/FeedComparator.java index 7086ef1032..dd8f13afa4 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/FeedComparator.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/FeedComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -35,7 +35,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.service; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RSSService.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RSSService.java index 69361cbeff..5fcafe45dd 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RSSService.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RSSService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.service; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RSSServiceProvider.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RSSServiceProvider.java index b53986207f..56006a8f87 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RSSServiceProvider.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RSSServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.service; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RssAggregator.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RssAggregator.java index 577e69e607..16ce1d498f 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RssAggregator.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RssAggregator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.service; diff --git a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RssAggregatorCache.java b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RssAggregatorCache.java index e01f232f81..fd0643108d 100644 --- a/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RssAggregatorCache.java +++ b/rssAggregator/rssAggregator-library/src/main/java/org/silverpeas/components/rssaggregator/service/RssAggregatorCache.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.service; diff --git a/rssAggregator/rssAggregator-library/src/main/resources/META-INF/beans.xml b/rssAggregator/rssAggregator-library/src/main/resources/META-INF/beans.xml index 71781dd9e9..523a978158 100644 --- a/rssAggregator/rssAggregator-library/src/main/resources/META-INF/beans.xml +++ b/rssAggregator/rssAggregator-library/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <beans diff --git a/rssAggregator/rssAggregator-war/pom.xml b/rssAggregator/rssAggregator-war/pom.xml index e585a90772..4e74bd1ce1 100644 --- a/rssAggregator/rssAggregator-war/pom.xml +++ b/rssAggregator/rssAggregator-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>rssaggregator</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.rssaggregator</groupId> diff --git a/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/control/RssAgregatorSessionController.java b/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/control/RssAgregatorSessionController.java index bfc6efb42c..2c9d6cc7e4 100644 --- a/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/control/RssAgregatorSessionController.java +++ b/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/control/RssAgregatorSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.control; diff --git a/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/model/RSSViewType.java b/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/model/RSSViewType.java index 970a64bf80..73a324e020 100644 --- a/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/model/RSSViewType.java +++ b/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/model/RSSViewType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.model; diff --git a/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/servlets/RssAgregatorRequestRouter.java b/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/servlets/RssAgregatorRequestRouter.java index 441b71b3bb..c3ac9f82b4 100644 --- a/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/servlets/RssAgregatorRequestRouter.java +++ b/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/servlets/RssAgregatorRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.servlets; diff --git a/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/web/RSSResource.java b/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/web/RSSResource.java index 08a0e23e04..ae43b46030 100644 --- a/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/web/RSSResource.java +++ b/rssAggregator/rssAggregator-war/src/main/java/org/silverpeas/components/rssaggregator/web/RSSResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.rssaggregator.web; diff --git a/rssAggregator/rssAggregator-war/src/main/webapp/WEB-INF/beans.xml b/rssAggregator/rssAggregator-war/src/main/webapp/WEB-INF/beans.xml index 71781dd9e9..523a978158 100644 --- a/rssAggregator/rssAggregator-war/src/main/webapp/WEB-INF/beans.xml +++ b/rssAggregator/rssAggregator-war/src/main/webapp/WEB-INF/beans.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <beans diff --git a/rssAggregator/rssAggregator-war/src/main/webapp/WEB-INF/web.xml b/rssAggregator/rssAggregator-war/src/main/webapp/WEB-INF/web.xml index 3a621b837d..5afe16617e 100644 --- a/rssAggregator/rssAggregator-war/src/main/webapp/WEB-INF/web.xml +++ b/rssAggregator/rssAggregator-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/channelManager.jsp b/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/channelManager.jsp index a37de50a1a..9e6700aad3 100644 --- a/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/channelManager.jsp +++ b/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/channelManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/check.jsp b/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/check.jsp index e1a3fe0819..145ad21120 100644 --- a/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/check.jsp +++ b/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/displayRSS.jsp b/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/displayRSS.jsp index 7fdaa3bf53..9795284407 100644 --- a/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/displayRSS.jsp +++ b/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/displayRSS.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="com.rometools.rome.feed.synd.SyndEntry" %> @@ -69,7 +69,7 @@ void displayChannel(SPChannel spChannel, SimpleDateFormat dateFormatter, String SyndImage channelImage = null; if (feed != null) { channelName = feed.getTitle(); - if (channelName.length() > 40) { + if (channelName != null && channelName.length() > 40) { channelName = channelName.substring(0, 39)+"..."; } channelImage = feed.getImage(); diff --git a/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/rssPortletView.jsp b/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/rssPortletView.jsp index 88bf6f3be2..0f7462e766 100644 --- a/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/rssPortletView.jsp +++ b/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/rssPortletView.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/whatIsRss.jsp b/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/whatIsRss.jsp index cb21e720ed..bcd2b329e2 100644 --- a/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/whatIsRss.jsp +++ b/rssAggregator/rssAggregator-war/src/main/webapp/rssAgregator/jsp/whatIsRss.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/scheduleEvent/pom.xml b/scheduleEvent/pom.xml index d29a8be92f..bdbef548de 100644 --- a/scheduleEvent/pom.xml +++ b/scheduleEvent/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/scheduleEvent/scheduleEvent-configuration/pom.xml b/scheduleEvent/scheduleEvent-configuration/pom.xml index 4b309c65ce..418f869e90 100644 --- a/scheduleEvent/scheduleEvent-configuration/pom.xml +++ b/scheduleEvent/scheduleEvent-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>scheduleevent</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.scheduleevent</groupId> diff --git a/scheduleEvent/scheduleEvent-configuration/src/main/config/migrations/modules/scheduleevent-migration.xml b/scheduleEvent/scheduleEvent-configuration/src/main/config/migrations/modules/scheduleevent-migration.xml index e7234d4f40..26f189014b 100644 --- a/scheduleEvent/scheduleEvent-configuration/src/main/config/migrations/modules/scheduleevent-migration.xml +++ b/scheduleEvent/scheduleEvent-configuration/src/main/config/migrations/modules/scheduleevent-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <migration module="scheduleevent" diff --git a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle.properties b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle.properties index 7839619823..d159b72315 100644 --- a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle.properties +++ b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # component diff --git a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_de.properties b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_de.properties index ab5d9fa921..722fc64688 100644 --- a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_de.properties +++ b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # component diff --git a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_en.properties b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_en.properties index 5d8e27e94a..efa7a624fa 100644 --- a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_en.properties +++ b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # application diff --git a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_fr.properties b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_fr.properties index 20b551f5c0..7c0347cf61 100644 --- a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_fr.properties +++ b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/multilang/ScheduleEventBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # component diff --git a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/settings/ScheduleEventSettings.properties b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/settings/ScheduleEventSettings.properties index 4bc997ad3e..a9c5b6b5cd 100644 --- a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/settings/ScheduleEventSettings.properties +++ b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/components/scheduleevent/settings/ScheduleEventSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # enableComment = true diff --git a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/util/logging/scheduleeventLogging.properties b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/util/logging/scheduleeventLogging.properties index d2a48f059e..49c98ef44f 100644 --- a/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/util/logging/scheduleeventLogging.properties +++ b/scheduleEvent/scheduleEvent-configuration/src/main/config/properties/org/silverpeas/util/logging/scheduleeventLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/scheduleEvent/scheduleEvent-library/pom.xml b/scheduleEvent/scheduleEvent-library/pom.xml index bdb7791842..3930cdecab 100644 --- a/scheduleEvent/scheduleEvent-library/pom.xml +++ b/scheduleEvent/scheduleEvent-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>scheduleevent</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.scheduleevent</groupId> diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/constant/ScheduleEventConstant.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/constant/ScheduleEventConstant.java index 7152aad87a..cef5162ff7 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/constant/ScheduleEventConstant.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/constant/ScheduleEventConstant.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.constant; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/AbstractScheduleEventUserNotification.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/AbstractScheduleEventUserNotification.java index 00622b8d26..d4b7f55346 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/AbstractScheduleEventUserNotification.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/AbstractScheduleEventUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.notification; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/ScheduleEventUserCallAgainNotification.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/ScheduleEventUserCallAgainNotification.java index 78993928db..73b2797d9e 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/ScheduleEventUserCallAgainNotification.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/ScheduleEventUserCallAgainNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.notification; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/ScheduleEventUserNotification.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/ScheduleEventUserNotification.java index eb9fbac2e0..bcb306af88 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/ScheduleEventUserNotification.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/notification/ScheduleEventUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.notification; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/CalendarEventEncoder.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/CalendarEventEncoder.java index 27c2412ad3..424611c8dc 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/CalendarEventEncoder.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/CalendarEventEncoder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventService.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventService.java index f9bbac35bf..56411aecea 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventService.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventServiceImpl.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventServiceImpl.java index 2fd8ce86ff..0814ebdd28 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventServiceImpl.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventServiceProvider.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventServiceProvider.java index ce92cbc312..79bb981af2 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventServiceProvider.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/ScheduleEventServiceProvider.java @@ -3,7 +3,7 @@ import javax.inject.Inject; /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -13,14 +13,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ public class ScheduleEventServiceProvider { diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/ScheduleEventStatus.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/ScheduleEventStatus.java index 4a84cf9f3f..87139acb90 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/ScheduleEventStatus.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/ScheduleEventStatus.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/Contributor.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/Contributor.java index 0ee2dbae4c..8e9837796f 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/Contributor.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/Contributor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.beans; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ContributorComparator.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ContributorComparator.java index e57ddeaa69..3265051ed6 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ContributorComparator.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ContributorComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.beans; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/DateOption.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/DateOption.java index d31caac7f5..128998609d 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/DateOption.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/DateOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.beans; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/DateOptionsComparator.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/DateOptionsComparator.java index 8f1410134b..d2ab2db101 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/DateOptionsComparator.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/DateOptionsComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.beans; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/Response.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/Response.java index 8cecc29c20..a812f71758 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/Response.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/Response.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.beans; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ScheduleEvent.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ScheduleEvent.java index 48494aef40..5629501229 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ScheduleEvent.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ScheduleEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.beans; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ScheduleEventComparator.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ScheduleEventComparator.java index 4f747cc5ec..c2b85ab4a6 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ScheduleEventComparator.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/ScheduleEventComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.beans; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/UserEventPK.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/UserEventPK.java index c9e01c00d8..3147c49d59 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/UserEventPK.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/beans/UserEventPK.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.beans; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ContributorDao.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ContributorDao.java index 4a520b26ad..62b21c2689 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ContributorDao.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ContributorDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.dao; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ContributorDaoImpl.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ContributorDaoImpl.java index 46039b50c2..9a487d5274 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ContributorDaoImpl.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ContributorDaoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.dao; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/DateOptionDao.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/DateOptionDao.java index 82e8001425..40836621c5 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/DateOptionDao.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/DateOptionDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.dao; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/DateOptionDaoImpl.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/DateOptionDaoImpl.java index 1c5deaacd0..67f5f3778d 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/DateOptionDaoImpl.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/DateOptionDaoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.dao; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ResponseDao.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ResponseDao.java index 1dea2ffd43..28a777757d 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ResponseDao.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ResponseDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.dao; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ResponseDaoImpl.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ResponseDaoImpl.java index 75fc9a09be..ce51221087 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ResponseDaoImpl.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ResponseDaoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.dao; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ScheduleEventDao.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ScheduleEventDao.java index b367c6c113..2d93bdfcaa 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ScheduleEventDao.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ScheduleEventDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.dao; diff --git a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ScheduleEventDaoImpl.java b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ScheduleEventDaoImpl.java index 93c5972351..e8b45b6400 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ScheduleEventDaoImpl.java +++ b/scheduleEvent/scheduleEvent-library/src/main/java/org/silverpeas/components/scheduleevent/service/model/dao/ScheduleEventDaoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.service.model.dao; diff --git a/scheduleEvent/scheduleEvent-library/src/main/resources/META-INF/beans.xml b/scheduleEvent/scheduleEvent-library/src/main/resources/META-INF/beans.xml index 71781dd9e9..523a978158 100644 --- a/scheduleEvent/scheduleEvent-library/src/main/resources/META-INF/beans.xml +++ b/scheduleEvent/scheduleEvent-library/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <beans diff --git a/scheduleEvent/scheduleEvent-war/pom.xml b/scheduleEvent/scheduleEvent-war/pom.xml index 5a78d9c25a..9774775d42 100644 --- a/scheduleEvent/scheduleEvent-war/pom.xml +++ b/scheduleEvent/scheduleEvent-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>scheduleevent</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.scheduleevent</groupId> diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/control/ScheduleEventSessionController.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/control/ScheduleEventSessionController.java index d053a75f3b..be85c68692 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/control/ScheduleEventSessionController.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/control/ScheduleEventSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.control; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/RequestHandlerRegistry.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/RequestHandlerRegistry.java index 12b3c0bdcd..c81ecb9bdd 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/RequestHandlerRegistry.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/RequestHandlerRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/ScheduleEventRequestRouter.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/ScheduleEventRequestRouter.java index b4e18cea2a..a2ef9beb2d 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/ScheduleEventRequestRouter.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/ScheduleEventRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventActionDateRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventActionDateRequestHandler.java index ea16db4148..b0e536d6e6 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventActionDateRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventActionDateRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddDateRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddDateRequestHandler.java index 8bed57cb0d..6000a39e26 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddDateRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddDateRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddInfosGeneRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddInfosGeneRequestHandler.java index 771d1cecb9..c8d6a79241 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddInfosGeneRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddInfosGeneRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddOptionsHourRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddOptionsHourRequestHandler.java index 6387922477..327c66add4 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddOptionsHourRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddOptionsHourRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddOptionsNextRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddOptionsNextRequestHandler.java index 3b00c85582..99b3cb38cd 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddOptionsNextRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddOptionsNextRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddRequestHandler.java index 8736e54369..09ff99dc8f 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventAddRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackDateRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackDateRequestHandler.java index 5a42b5ef06..c0f90dc3c8 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackDateRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackDateRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackHourRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackHourRequestHandler.java index 3ad7e02183..7ffd223640 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackHourRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackHourRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackInfosGeneRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackInfosGeneRequestHandler.java index be1adb491e..697c772ba6 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackInfosGeneRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackInfosGeneRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackwardRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackwardRequestHandler.java index 9ecffd257d..cb812dc613 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackwardRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventBackwardRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventCancelRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventCancelRequestHandler.java index d2beac00c4..cd82a273dc 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventCancelRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventCancelRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmRequestHandler.java index 44353a7034..779708cac5 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmScreenRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmScreenRequestHandler.java index f0025537fe..f1bf00bbf4 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmScreenRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmScreenRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmUsersRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmUsersRequestHandler.java index 6edac0f74d..a899970a1d 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmUsersRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventConfirmUsersRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDateNextRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDateNextRequestHandler.java index b71adcef3a..0f9475b198 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDateNextRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDateNextRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDeleteDateRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDeleteDateRequestHandler.java index 13e80ea76f..9ee89dd4ce 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDeleteDateRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDeleteDateRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDeleteRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDeleteRequestHandler.java index d4e80a3df1..ad70be4421 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDeleteRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDeleteRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDescriptionNextRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDescriptionNextRequestHandler.java index 3d1a1d0164..ae69c1ea71 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDescriptionNextRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDescriptionNextRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDetailRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDetailRequestHandler.java index 7cd859d49c..06f37f1133 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDetailRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventDetailRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify it under the terms of the * GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -9,14 +9,14 @@ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the * text describing the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License along with this program. - * If not, see <http://www.gnu.org/licenses/>. + * If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventExportRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventExportRequestHandler.java index b9086c99b4..b5de47651a 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventExportRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventExportRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventMainRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventMainRequestHandler.java index dcb4cef204..3a98fc379e 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventMainRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventMainRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventModifyStateRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventModifyStateRequestHandler.java index 00a6879125..47470a921b 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventModifyStateRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventModifyStateRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventOpenUserRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventOpenUserRequestHandler.java index 9d3412f7cc..8f1a36207f 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventOpenUserRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventOpenUserRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventRequestHandler.java index e25238cffc..3430624089 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventTimeNextRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventTimeNextRequestHandler.java index b07864b4e2..fb6802334c 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventTimeNextRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventTimeNextRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventValidResponseRequestHandler.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventValidResponseRequestHandler.java index 189bd7307c..7919a2fba6 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventValidResponseRequestHandler.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/servlets/handlers/ScheduleEventValidResponseRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.servlets.handlers; diff --git a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/view/AbstractTimeVO.java b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/view/AbstractTimeVO.java index af650f05eb..92769ea89b 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/view/AbstractTimeVO.java +++ b/scheduleEvent/scheduleEvent-war/src/main/java/org/silverpeas/components/scheduleevent/view/AbstractTimeVO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.scheduleevent.view; diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/WEB-INF/beans.xml b/scheduleEvent/scheduleEvent-war/src/main/webapp/WEB-INF/beans.xml index 71781dd9e9..523a978158 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/WEB-INF/beans.xml +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/WEB-INF/beans.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <beans diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/WEB-INF/web.xml b/scheduleEvent/scheduleEvent-war/src/main/webapp/WEB-INF/web.xml index fe36f9a959..4d5250251c 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/WEB-INF/web.xml +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/check.jsp b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/check.jsp index 5016a35cbe..0c7cfb1407 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/check.jsp +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false"%> diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/detail.jsp b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/detail.jsp index 4e78f237aa..0fc46b6c1c 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/detail.jsp +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/detail.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="check.jsp"%> diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/exportIcalPopup.jsp b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/exportIcalPopup.jsp index 09e71fd1cc..d3dfd86483 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/exportIcalPopup.jsp +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/exportIcalPopup.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="check.jsp" %> diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/generalInfo.jsp b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/generalInfo.jsp index 4bf486309f..cf2413a2a3 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/generalInfo.jsp +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/generalInfo.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="../check.jsp"%> diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/notify.jsp b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/notify.jsp index 5d70be455b..fc659fce0f 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/notify.jsp +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/notify.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="../check.jsp"%> diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/options.jsp b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/options.jsp index cebd1a37c8..4de8416d8e 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/options.jsp +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/options.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="../check.jsp"%> diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/optionshour.jsp b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/optionshour.jsp index e9dc0fa081..15f8a1d716 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/optionshour.jsp +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/form/optionshour.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="../check.jsp"%> diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/list.jsp b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/list.jsp index 76b189af02..d2eb0cd755 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/list.jsp +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/list.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="check.jsp"%> diff --git a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/styleSheets/scheduleevent.css b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/styleSheets/scheduleevent.css index 3cfe6adcba..ec33107bc7 100644 --- a/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/styleSheets/scheduleevent.css +++ b/scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/styleSheets/scheduleevent.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ img { diff --git a/silverCrawler/pom.xml b/silverCrawler/pom.xml index ae87ecd3c8..4499e48bfd 100644 --- a/silverCrawler/pom.xml +++ b/silverCrawler/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/silverCrawler/silverCrawler-configuration/pom.xml b/silverCrawler/silverCrawler-configuration/pom.xml index 4a84879c9c..27a78a87dc 100644 --- a/silverCrawler/silverCrawler-configuration/pom.xml +++ b/silverCrawler/silverCrawler-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>silvercrawler</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.silvercrawler</groupId> diff --git a/silverCrawler/silverCrawler-configuration/src/main/config/migrations/modules/silverCrawler-migration.xml b/silverCrawler/silverCrawler-configuration/src/main/config/migrations/modules/silverCrawler-migration.xml index 8354d32b38..5422fbea6b 100644 --- a/silverCrawler/silverCrawler-configuration/src/main/config/migrations/modules/silverCrawler-migration.xml +++ b/silverCrawler/silverCrawler-configuration/src/main/config/migrations/modules/silverCrawler-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <migration module="silverCrawler" xmlns="http://silverpeas.org/xml/ns/migration" diff --git a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle.properties b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle.properties index 3d9cc500e9..6a1e9e1f5b 100644 --- a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle.properties +++ b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # silverCrawler.operation = Op\u00e9rations silverCrawler.reIndexer = R\u00e9indexer diff --git a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_de.properties b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_de.properties index d89a6239f5..831c9a7173 100644 --- a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_de.properties +++ b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # silverCrawler.operation = Operationen diff --git a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_en.properties b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_en.properties index 291d560d47..971f409dc9 100644 --- a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_en.properties +++ b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # silverCrawler.operation = Operations silverCrawler.reIndexer = Reindex diff --git a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_fr.properties b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_fr.properties index 3d9cc500e9..6a1e9e1f5b 100644 --- a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_fr.properties +++ b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/multilang/silverCrawlerBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # silverCrawler.operation = Op\u00e9rations silverCrawler.reIndexer = R\u00e9indexer diff --git a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/settings/silverCrawlerIcons.properties b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/settings/silverCrawlerIcons.properties index 05e0485216..2e94228cc7 100644 --- a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/settings/silverCrawlerIcons.properties +++ b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/settings/silverCrawlerIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # silverCrawler.delete = /util/icons/publicationDelete.gif silverCrawler.smallDelete = /util/icons/delete.gif diff --git a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/settings/silverCrawlerSettings.properties b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/settings/silverCrawlerSettings.properties index f95f62fa1d..232fa4e108 100644 --- a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/settings/silverCrawlerSettings.properties +++ b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/silvercrawler/settings/silverCrawlerSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # dates et heures de l'indexation automatique des fichiers cronScheduledIndex = 00 23 * * * diff --git a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/util/logging/silvercrawlerLogging.properties b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/util/logging/silvercrawlerLogging.properties index 2bcd6a51d3..a2c112d8fb 100644 --- a/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/util/logging/silvercrawlerLogging.properties +++ b/silverCrawler/silverCrawler-configuration/src/main/config/properties/org/silverpeas/util/logging/silvercrawlerLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/silverCrawler/silverCrawler-configuration/src/main/config/xmlcomponents/silverCrawler.xml b/silverCrawler/silverCrawler-configuration/src/main/config/xmlcomponents/silverCrawler.xml index eb877852ad..697638c8f0 100644 --- a/silverCrawler/silverCrawler-configuration/src/main/config/xmlcomponents/silverCrawler.xml +++ b/silverCrawler/silverCrawler-configuration/src/main/config/xmlcomponents/silverCrawler.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2000 - 2020 Silverpeas This program is free software: +<!-- Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. As a special @@ -7,12 +7,12 @@ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and - it is also available here: "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + it is also available here: "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public - License along with this program. If not, see <http://www.gnu.org/licenses/>. --> + License along with this program. If not, see <https://www.gnu.org/licenses/>. --> <WAComponent xmlns="http://silverpeas.org/xml/ns/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://silverpeas.org/xml/ns/component http://www.silverpeas.org/xsd/component.xsd"> diff --git a/silverCrawler/silverCrawler-library/pom.xml b/silverCrawler/silverCrawler-library/pom.xml index e6478958ba..d30f6a3bf6 100644 --- a/silverCrawler/silverCrawler-library/pom.xml +++ b/silverCrawler/silverCrawler-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>silvercrawler</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.silvercrawler</groupId> diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/ScheduledIndexFiles.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/ScheduledIndexFiles.java index 1d45dfda41..debba37c7a 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/ScheduledIndexFiles.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/ScheduledIndexFiles.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/SilverCrawlerInitialize.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/SilverCrawlerInitialize.java index 54a5e2df85..d590d772a2 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/SilverCrawlerInitialize.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/SilverCrawlerInitialize.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/AccessProfile.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/AccessProfile.java index ef5a98fa1b..5b23d236fb 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/AccessProfile.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/AccessProfile.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.model; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/FileDetail.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/FileDetail.java index a9974716de..ae71073d07 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/FileDetail.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/FileDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.model; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/FileFolder.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/FileFolder.java index e650955456..9d31ef45fc 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/FileFolder.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/FileFolder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.model; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFileUploadException.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFileUploadException.java index 4d9bcaf536..39f68aa412 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFileUploadException.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFileUploadException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.model; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFolderCreationException.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFolderCreationException.java index 7ebc76e0b1..6c0e2d30ad 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFolderCreationException.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFolderCreationException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.model; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFolderRenameException.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFolderRenameException.java index ed663300aa..df1ffc6e7a 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFolderRenameException.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerFolderRenameException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.model; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerForbiddenActionException.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerForbiddenActionException.java index 39643a0bb7..3078f5ec55 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerForbiddenActionException.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerForbiddenActionException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.model; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerRuntimeException.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerRuntimeException.java index b7bb10fac6..4747f25b06 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerRuntimeException.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/model/SilverCrawlerRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.model; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/package-info.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/package-info.java index 218e435dfa..27f1edb0e1 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/package-info.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. * @author mmoquillon */ /** diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryByUser.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryByUser.java index b665d4d492..23a42df0b0 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryByUser.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryByUser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.statistic; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryDAO.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryDAO.java index da70c59765..bbfae3abca 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryDAO.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.statistic; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryDetail.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryDetail.java index a5c09a9525..7456ac852f 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryDetail.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/HistoryDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.statistic; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/Statistic.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/Statistic.java index 6eb54d012c..47caa31bf4 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/Statistic.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/statistic/Statistic.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.statistic; diff --git a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/util/FileServerUtils.java b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/util/FileServerUtils.java index 6be631a0b1..d4995f23fd 100644 --- a/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/util/FileServerUtils.java +++ b/silverCrawler/silverCrawler-library/src/main/java/org/silverpeas/components/silvercrawler/util/FileServerUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.util; diff --git a/silverCrawler/silverCrawler-war/pom.xml b/silverCrawler/silverCrawler-war/pom.xml index 3c82536f65..c94432e182 100644 --- a/silverCrawler/silverCrawler-war/pom.xml +++ b/silverCrawler/silverCrawler-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>silvercrawler</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.silvercrawler</groupId> diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/SilverCrawlerIndexer.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/SilverCrawlerIndexer.java index 083e157547..74258730eb 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/SilverCrawlerIndexer.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/SilverCrawlerIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/FolderZIPInfo.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/FolderZIPInfo.java index 8029b4450e..87b9aa6d1f 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/FolderZIPInfo.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/FolderZIPInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.control; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/IPMaskHelper.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/IPMaskHelper.java index 7e532db7dd..2760a02ee1 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/IPMaskHelper.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/IPMaskHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.control; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/ProfileHelper.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/ProfileHelper.java index 0947eb6530..7e14abccb6 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/ProfileHelper.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/ProfileHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.control; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/SilverCrawlerSessionController.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/SilverCrawlerSessionController.java index 6fe5518731..9166373cf8 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/SilverCrawlerSessionController.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/SilverCrawlerSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.control; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/UploadItem.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/UploadItem.java index 8c50440bc8..ee9274c9d7 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/UploadItem.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/UploadItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.control; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/UploadReport.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/UploadReport.java index 6ef2cf94b1..f8f88ae2d0 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/UploadReport.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/control/UploadReport.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.control; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/package-info.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/package-info.java index 4eb5f41362..3974dfffc1 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/package-info.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. * @author mmoquillon */ package org.silverpeas.components.silvercrawler; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/DragAndDrop.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/DragAndDrop.java index 593e3bf5d1..29824b3eaa 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/DragAndDrop.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/DragAndDrop.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/GoToCrawler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/GoToCrawler.java index 6cf80cdccb..cab91fb272 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/GoToCrawler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/GoToCrawler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/SilverCrawlerFileServer.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/SilverCrawlerFileServer.java index 0ad419dcd3..2ece48e1e2 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/SilverCrawlerFileServer.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/SilverCrawlerFileServer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/SilverCrawlerRequestRouter.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/SilverCrawlerRequestRouter.java index cd264e450f..adf8265aed 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/SilverCrawlerRequestRouter.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/SilverCrawlerRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ActivateReadWriteAccessHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ActivateReadWriteAccessHandler.java index 9aa5a86657..9c7700da32 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ActivateReadWriteAccessHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ActivateReadWriteAccessHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/BackToSearchResultsHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/BackToSearchResultsHandler.java index 444660ccaf..5b5f1aff1d 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/BackToSearchResultsHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/BackToSearchResultsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/CreateFolderFormHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/CreateFolderFormHandler.java index 562c017099..a8644597f0 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/CreateFolderFormHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/CreateFolderFormHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/CreateFolderHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/CreateFolderHandler.java index 0060901197..e17a4bee94 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/CreateFolderHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/CreateFolderHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/DownloadFolderHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/DownloadFolderHandler.java index b7c425ce55..d42767e1e4 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/DownloadFolderHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/DownloadFolderHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/FunctionHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/FunctionHandler.java index ae7b3b3678..7a15573f62 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/FunctionHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/FunctionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/GoToDirectoryHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/GoToDirectoryHandler.java index 6901b50bfb..a7f171b451 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/GoToDirectoryHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/GoToDirectoryHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/HandlerProvider.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/HandlerProvider.java index b7bbf932f3..9056a238a1 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/HandlerProvider.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/HandlerProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexFileHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexFileHandler.java index 1ad36d6dde..6c9b998ba1 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexFileHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexFileHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexPathHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexPathHandler.java index a236b106db..77d735a9bd 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexPathHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexPathHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexSelectedFilesHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexSelectedFilesHandler.java index af93071ecc..4fb4a6274f 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexSelectedFilesHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexSelectedFilesHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexSelectedFoldersHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexSelectedFoldersHandler.java index e5c73826d0..3a2a48471b 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexSelectedFoldersHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/IndexSelectedFoldersHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/InitHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/InitHandler.java index 97edaa38e1..8cc5870063 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/InitHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/InitHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/PortletHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/PortletHandler.java index 3c7c043b0f..8f008cedbb 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/PortletHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/PortletHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ProcessDragAndDropHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ProcessDragAndDropHandler.java index 18c7100331..e5908faed5 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ProcessDragAndDropHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ProcessDragAndDropHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveFileHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveFileHandler.java index d83c3820df..9174b02fd8 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveFileHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveFileHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveFolderHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveFolderHandler.java index 31c8cd4665..50d697b25f 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveFolderHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveFolderHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveSelectedFilesHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveSelectedFilesHandler.java index 5736a91e52..62bda2726c 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveSelectedFilesHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveSelectedFilesHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveSelectedFoldersHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveSelectedFoldersHandler.java index 56974e8583..84d4ac3b3e 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveSelectedFoldersHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RemoveSelectedFoldersHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFileFormHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFileFormHandler.java index 3f43e30956..295eecbe36 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFileFormHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFileFormHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFileHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFileHandler.java index 2e453f82fe..fdaca43762 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFileHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFileHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFolderFormHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFolderFormHandler.java index 56f8c1513c..89143ce95e 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFolderFormHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFolderFormHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFolderHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFolderHandler.java index 3f14be3c5f..a8acd596bb 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFolderHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/RenameFolderHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ResolveConflictsHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ResolveConflictsHandler.java index 4114de0775..ec83635e9d 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ResolveConflictsHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ResolveConflictsHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SearchHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SearchHandler.java index 8754c96412..81b7ed5600 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SearchHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SearchHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SubDirectoryFromResultHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SubDirectoryFromResultHandler.java index c98d78555a..85e9ccb628 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SubDirectoryFromResultHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SubDirectoryFromResultHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SubDirectoryHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SubDirectoryHandler.java index 723f172ab8..f8691f66e5 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SubDirectoryHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/SubDirectoryHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UnActivateReadWriteAccessHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UnActivateReadWriteAccessHandler.java index 2cc570d0bb..401f8530c2 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UnActivateReadWriteAccessHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UnActivateReadWriteAccessHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UploadFileFormHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UploadFileFormHandler.java index 3695db355a..f40b76a256 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UploadFileFormHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UploadFileFormHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UploadFileHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UploadFileHandler.java index f0672c4bc1..46f5839a1b 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UploadFileHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/UploadFileHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDirectoryHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDirectoryHandler.java index 2c9c4a5247..174d8a658b 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDirectoryHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDirectoryHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDownloadHistoryFromResultHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDownloadHistoryFromResultHandler.java index f28609c768..7fa22be448 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDownloadHistoryFromResultHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDownloadHistoryFromResultHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDownloadHistoryHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDownloadHistoryHandler.java index 6eeaca24bd..479be6b7f1 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDownloadHistoryHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewDownloadHistoryHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewHistoryByUserHandler.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewHistoryByUserHandler.java index c5df7cc972..8b05e3ff91 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewHistoryByUserHandler.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/servlets/handlers/ViewHistoryByUserHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.servlets.handlers; diff --git a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/util/IpAddressMatcher.java b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/util/IpAddressMatcher.java index 93bb91e63e..e2d0a125e6 100644 --- a/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/util/IpAddressMatcher.java +++ b/silverCrawler/silverCrawler-war/src/main/java/org/silverpeas/components/silvercrawler/util/IpAddressMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.silvercrawler.util; diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/WEB-INF/tags/silverpeas/silverCrawler/browseBar.tag b/silverCrawler/silverCrawler-war/src/main/webapp/WEB-INF/tags/silverpeas/silverCrawler/browseBar.tag index f0502d9fbe..20f13cbb43 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/WEB-INF/tags/silverpeas/silverCrawler/browseBar.tag +++ b/silverCrawler/silverCrawler-war/src/main/webapp/WEB-INF/tags/silverpeas/silverCrawler/browseBar.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/WEB-INF/web.xml b/silverCrawler/silverCrawler-war/src/main/webapp/WEB-INF/web.xml index 121196b5a0..1e606ec0d3 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/WEB-INF/web.xml +++ b/silverCrawler/silverCrawler-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <web-app> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/check.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/check.jsp index 689e78ad91..15dd15e622 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/check.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/download.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/download.jsp index 33ceb4729c..0fb9b59322 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/download.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/download.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.core.util.file.FileRepositoryManager" %> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/dragNDropConflicts.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/dragNDropConflicts.jsp index 0cd3c63a4d..cd84784165 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/dragNDropConflicts.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/dragNDropConflicts.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/fileRenameForm.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/fileRenameForm.jsp index 780f70a2a7..8bea207d81 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/fileRenameForm.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/fileRenameForm.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/fileUploadForm.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/fileUploadForm.jsp index 31b70754a0..c649de2b2f 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/fileUploadForm.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/fileUploadForm.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/folderCreationForm.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/folderCreationForm.jsp index 9cb0b72597..6d057ed5b4 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/folderCreationForm.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/folderCreationForm.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/folderRenameForm.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/folderRenameForm.jsp index 92758533b4..774293cc56 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/folderRenameForm.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/folderRenameForm.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/history.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/history.jsp index 3d91406c62..977bfa8e65 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/history.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/history.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/historyByUser.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/historyByUser.jsp index 46a824f0a7..667649dd4a 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/historyByUser.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/historyByUser.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/portlet.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/portlet.jsp index 9280f894e3..23d63a4ef9 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/portlet.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/portlet.jsp @@ -4,7 +4,7 @@ <%@ page import="org.silverpeas.core.util.URLUtil" %> <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -16,7 +16,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,7 +24,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/viewDirectory.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/viewDirectory.jsp index c2eb84c686..697553f1af 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/viewDirectory.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/viewDirectory.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="java.net.URLEncoder"%> diff --git a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/viewResultSearch.jsp b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/viewResultSearch.jsp index 1ca79ca6d4..5fde33541a 100644 --- a/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/viewResultSearch.jsp +++ b/silverCrawler/silverCrawler-war/src/main/webapp/silverCrawler/jsp/viewResultSearch.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.util.WebEncodeHelper"%> diff --git a/silverpeas-license.txt b/silverpeas-license.txt index c05b710cc7..8055db64be 100644 --- a/silverpeas-license.txt +++ b/silverpeas-license.txt @@ -1,4 +1,4 @@ -Copyright (C) 2000 - 2020 Silverpeas +Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -18,4 +18,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. +along with this program. If not, see <https://www.gnu.org/licenses/>. diff --git a/spaceMembers/pom.xml b/spaceMembers/pom.xml index 1856b79d49..afa2a693fb 100644 --- a/spaceMembers/pom.xml +++ b/spaceMembers/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/spaceMembers/spaceMembers-configuration/pom.xml b/spaceMembers/spaceMembers-configuration/pom.xml index db2cc476e3..35389f937a 100644 --- a/spaceMembers/spaceMembers-configuration/pom.xml +++ b/spaceMembers/spaceMembers-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>spacemembers</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.spacemembers</groupId> diff --git a/spaceMembers/spaceMembers-configuration/src/main/config/properties/org/silverpeas/util/logging/spaceMembersLogging.properties b/spaceMembers/spaceMembers-configuration/src/main/config/properties/org/silverpeas/util/logging/spaceMembersLogging.properties index 4e178b7b42..e1e86ffd93 100644 --- a/spaceMembers/spaceMembers-configuration/src/main/config/properties/org/silverpeas/util/logging/spaceMembersLogging.properties +++ b/spaceMembers/spaceMembers-configuration/src/main/config/properties/org/silverpeas/util/logging/spaceMembersLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/spaceMembers/spaceMembers-configuration/src/main/config/xmlcomponents/spaceMembers.xml b/spaceMembers/spaceMembers-configuration/src/main/config/xmlcomponents/spaceMembers.xml index ec0cba2334..148536de5e 100644 --- a/spaceMembers/spaceMembers-configuration/src/main/config/xmlcomponents/spaceMembers.xml +++ b/spaceMembers/spaceMembers-configuration/src/main/config/xmlcomponents/spaceMembers.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/spaceMembers/spaceMembers-library/pom.xml b/spaceMembers/spaceMembers-library/pom.xml index 2c078bc223..e911baf895 100644 --- a/spaceMembers/spaceMembers-library/pom.xml +++ b/spaceMembers/spaceMembers-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>spacemembers</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.spacemembers</groupId> diff --git a/spaceMembers/spaceMembers-library/src/main/java/org/silverpeas/components/spacemembers/SpaceMembersStatistics.java b/spaceMembers/spaceMembers-library/src/main/java/org/silverpeas/components/spacemembers/SpaceMembersStatistics.java index 17cef901da..269fc6fbf7 100644 --- a/spaceMembers/spaceMembers-library/src/main/java/org/silverpeas/components/spacemembers/SpaceMembersStatistics.java +++ b/spaceMembers/spaceMembers-library/src/main/java/org/silverpeas/components/spacemembers/SpaceMembersStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.spacemembers; diff --git a/spaceMembers/spaceMembers-war/pom.xml b/spaceMembers/spaceMembers-war/pom.xml index ff369d236d..47d12481f5 100644 --- a/spaceMembers/spaceMembers-war/pom.xml +++ b/spaceMembers/spaceMembers-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>spacemembers</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.spacemembers</groupId> diff --git a/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/SpaceMembersIndexer.java b/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/SpaceMembersIndexer.java index 8ecb482053..b83aee91de 100644 --- a/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/SpaceMembersIndexer.java +++ b/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/SpaceMembersIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.spacemembers; diff --git a/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/control/SpaceMembersSessionController.java b/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/control/SpaceMembersSessionController.java index e0c1a53a30..f6d6580e17 100644 --- a/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/control/SpaceMembersSessionController.java +++ b/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/control/SpaceMembersSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.com/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.spacemembers.control; diff --git a/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/servlets/SpaceMembersRequestRouter.java b/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/servlets/SpaceMembersRequestRouter.java index 54b53a6f58..7c284a9f5f 100644 --- a/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/servlets/SpaceMembersRequestRouter.java +++ b/spaceMembers/spaceMembers-war/src/main/java/org/silverpeas/components/spacemembers/servlets/SpaceMembersRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.spacemembers.servlets; diff --git a/spaceMembers/spaceMembers-war/src/main/webapp/WEB-INF/web.xml b/spaceMembers/spaceMembers-war/src/main/webapp/WEB-INF/web.xml index 4474305b0a..85fcd5c242 100644 --- a/spaceMembers/spaceMembers-war/src/main/webapp/WEB-INF/web.xml +++ b/spaceMembers/spaceMembers-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css index 28730294f2..251a8fbbee 100644 --- a/src/site/resources/css/site.css +++ b/src/site/resources/css/site.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* You can override this file with your own styles */ diff --git a/src/site/resources/css/style.css b/src/site/resources/css/style.css index d828a9dbc8..4709ea67f1 100644 --- a/src/site/resources/css/style.css +++ b/src/site/resources/css/style.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/src/site/resources/css/tn3/tn3.css b/src/site/resources/css/tn3/tn3.css index c94c55343f..10e26e6714 100644 --- a/src/site/resources/css/tn3/tn3.css +++ b/src/site/resources/css/tn3/tn3.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ @charset "utf-8"; diff --git a/src/site/site.xml b/src/site/site.xml index 476e3a67a1..fb11d61900 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 6d8cab500b..b8d571e3b0 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/suggestionBox/pom.xml b/suggestionBox/pom.xml index fe9516f40f..dac43344c2 100644 --- a/suggestionBox/pom.xml +++ b/suggestionBox/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.com/legal/licensing" + "https://www.silverpeas.org/legal/licensing" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,15 +21,15 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses />. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/suggestionBox/suggestionBox-configuration/pom.xml b/suggestionBox/suggestionBox-configuration/pom.xml index c2d4e2a3f9..cbf34e84f5 100644 --- a/suggestionBox/suggestionBox-configuration/pom.xml +++ b/suggestionBox/suggestionBox-configuration/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.com/legal/licensing" + "https://www.silverpeas.org/legal/licensing" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,15 +21,15 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses />. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>suggestionbox</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.suggestionbox</groupId> diff --git a/suggestionBox/suggestionBox-configuration/src/main/config/migrations/modules/suggestion-box-migration.xml b/suggestionBox/suggestionBox-configuration/src/main/config/migrations/modules/suggestion-box-migration.xml index 60025c467e..0d0ec0498e 100644 --- a/suggestionBox/suggestionBox-configuration/src/main/config/migrations/modules/suggestion-box-migration.xml +++ b/suggestionBox/suggestionBox-configuration/src/main/config/migrations/modules/suggestion-box-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="suggestionBox" xmlns="http://silverpeas.org/xml/ns/migration" diff --git a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle.properties b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle.properties index 216dccd125..fc9e046f5b 100644 --- a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle.properties +++ b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.com/legal/licensing" +# "https://www.silverpeas.org/legal/licensing" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # suggestionBox.label.suggestion.the=L'id\u00e9e diff --git a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_de.properties b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_de.properties index 9353dfbf77..2bc63dede3 100644 --- a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_de.properties +++ b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.com/legal/licensing" +# "https://www.silverpeas.org/legal/licensing" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # suggestionBox.label.suggestion.the=The suggestion diff --git a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_en.properties b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_en.properties index 9353dfbf77..2bc63dede3 100644 --- a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_en.properties +++ b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.com/legal/licensing" +# "https://www.silverpeas.org/legal/licensing" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # suggestionBox.label.suggestion.the=The suggestion diff --git a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_fr.properties b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_fr.properties index e97c6f0873..7c821294f1 100644 --- a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_fr.properties +++ b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/multilang/SuggestionBoxBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.com/legal/licensing" +# "https://www.silverpeas.org/legal/licensing" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # suggestionBox.label.suggestion.the=L'id\u00e9e diff --git a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/settings/SuggestionBoxIcons.properties b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/settings/SuggestionBoxIcons.properties index e6b7c79464..4762709780 100644 --- a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/settings/SuggestionBoxIcons.properties +++ b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/settings/SuggestionBoxIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.com/legal/licensing" +# "https://www.silverpeas.org/legal/licensing" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # suggestionBox.deleteSuggestion = /util/icons/delete.gif diff --git a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/settings/SuggestionBoxSettings.properties b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/settings/SuggestionBoxSettings.properties index bff187052a..1b8ae39d49 100644 --- a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/settings/SuggestionBoxSettings.properties +++ b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/components/suggestionbox/settings/SuggestionBoxSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # # Live time (in milliseconds) of displayed user notifications into the suggestion box diff --git a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/util/logging/suggestionBoxLogging.properties b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/util/logging/suggestionBoxLogging.properties index f2d0ee67e0..28ed385fb0 100644 --- a/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/util/logging/suggestionBoxLogging.properties +++ b/suggestionBox/suggestionBox-configuration/src/main/config/properties/org/silverpeas/util/logging/suggestionBoxLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/suggestionBox/suggestionBox-configuration/src/main/config/xmlcomponents/suggestionBox.xml b/suggestionBox/suggestionBox-configuration/src/main/config/xmlcomponents/suggestionBox.xml index b32f3ecf81..1b8cb30c8a 100644 --- a/suggestionBox/suggestionBox-configuration/src/main/config/xmlcomponents/suggestionBox.xml +++ b/suggestionBox/suggestionBox-configuration/src/main/config/xmlcomponents/suggestionBox.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.com/legal/licensing" + "https://www.silverpeas.org/legal/licensing" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <WAComponent xmlns="http://silverpeas.org/xml/ns/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/suggestionBox/suggestionBox-library/pom.xml b/suggestionBox/suggestionBox-library/pom.xml index 7398d9e03c..a4cd9d956b 100644 --- a/suggestionBox/suggestionBox-library/pom.xml +++ b/suggestionBox/suggestionBox-library/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.com/legal/licensing" + "https://www.silverpeas.org/legal/licensing" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,15 +21,15 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses />. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>suggestionbox</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.suggestionbox</groupId> diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxComponentSettings.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxComponentSettings.java index 1004640b8d..3a9c2d945d 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxComponentSettings.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxComponentSettings.java @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxInstancePostConstruction.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxInstancePostConstruction.java index 27b077f1dc..86f60f8553 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxInstancePostConstruction.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxInstancePreDestruction.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxInstancePreDestruction.java index a7acef6187..a2b9e03475 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxInstancePreDestruction.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/DefaultSuggestionBoxService.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/DefaultSuggestionBoxService.java index 61230baffe..bdab783d18 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/DefaultSuggestionBoxService.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/DefaultSuggestionBoxService.java @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.model; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/Suggestion.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/Suggestion.java index 6465a97070..0ea99d083c 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/Suggestion.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/Suggestion.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.model; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionBox.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionBox.java index 052c1c92b5..02ab675e9b 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionBox.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionBox.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.model; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionBoxService.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionBoxService.java index b2bca331f7..f3e641e5f7 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionBoxService.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionBoxService.java @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.model; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionCriteria.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionCriteria.java index ed78cc3608..7ffc3c1397 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionCriteria.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionCriteria.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.model; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionCriteriaProcessor.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionCriteriaProcessor.java index 8ee51b4f6b..bf344464ea 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionCriteriaProcessor.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/model/SuggestionCriteriaProcessor.java @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.model; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionActionUserNotification.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionActionUserNotification.java index 3b49a0430f..ab460e7495 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionActionUserNotification.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionActionUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.notification; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionBoxUserNotification.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionBoxUserNotification.java index ca44452a13..9f2a119bff 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionBoxUserNotification.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionBoxUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.notification; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionUserNotification.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionUserNotification.java index 2d4d8d360e..c16a741b86 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionUserNotification.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/AbstractSuggestionUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.notification; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionBoxInstanceManualUserNotification.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionBoxInstanceManualUserNotification.java index 65b7e9a665..edf249541b 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionBoxInstanceManualUserNotification.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionBoxInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.notification; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionBoxSubscriptionUserNotification.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionBoxSubscriptionUserNotification.java index 76fcf4ba9e..7ae9d4b630 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionBoxSubscriptionUserNotification.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionBoxSubscriptionUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.notification; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionNotifyManuallyUserNotification.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionNotifyManuallyUserNotification.java index 8ffd535c4e..f421d768f0 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionNotifyManuallyUserNotification.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionNotifyManuallyUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.notification; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionPendingValidationUserNotification.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionPendingValidationUserNotification.java index 1d77abeecb..7578db422a 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionPendingValidationUserNotification.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionPendingValidationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.notification; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionValidationUserNotification.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionValidationUserNotification.java index 2049b186eb..fee02ecb05 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionValidationUserNotification.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/notification/SuggestionValidationUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.notification; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/package-info.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/package-info.java index 4013d34845..1096f7a2b1 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/package-info.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. * @author mmoquillon */ package org.silverpeas.components.suggestionbox; \ No newline at end of file diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/JPQLQueryBuilder.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/JPQLQueryBuilder.java index cadb240ff6..6e7495ad8d 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/JPQLQueryBuilder.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/JPQLQueryBuilder.java @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.repository; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/SuggestionBoxRepository.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/SuggestionBoxRepository.java index 56d82b9026..9000ff381b 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/SuggestionBoxRepository.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/SuggestionBoxRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.repository; diff --git a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/SuggestionRepository.java b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/SuggestionRepository.java index 946b8e24f3..a994a6a2d8 100644 --- a/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/SuggestionRepository.java +++ b/suggestionBox/suggestionBox-library/src/main/java/org/silverpeas/components/suggestionbox/repository/SuggestionRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.repository; diff --git a/suggestionBox/suggestionBox-war/pom.xml b/suggestionBox/suggestionBox-war/pom.xml index 07e8d07c3d..3fc041ecc6 100644 --- a/suggestionBox/suggestionBox-war/pom.xml +++ b/suggestionBox/suggestionBox-war/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.com/legal/licensing" + "https://www.silverpeas.org/legal/licensing" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,15 +21,15 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses />. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>suggestionbox</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.suggestionbox</groupId> diff --git a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxIndexer.java b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxIndexer.java index 93040970da..935468c97b 100644 --- a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxIndexer.java +++ b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/SuggestionBoxIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.com/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox; diff --git a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/common/SuggestionBoxWebManager.java b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/common/SuggestionBoxWebManager.java index a8bcc492af..71dcc6b6e0 100644 --- a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/common/SuggestionBoxWebManager.java +++ b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/common/SuggestionBoxWebManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.common; diff --git a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/common/SuggestionFinderByCriteria.java b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/common/SuggestionFinderByCriteria.java index 32fba04e68..19c22a3b3c 100644 --- a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/common/SuggestionFinderByCriteria.java +++ b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/common/SuggestionFinderByCriteria.java @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.common; diff --git a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/control/SuggestionBoxWebController.java b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/control/SuggestionBoxWebController.java index e848031a50..ad2c746b94 100644 --- a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/control/SuggestionBoxWebController.java +++ b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/control/SuggestionBoxWebController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.com/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.control; diff --git a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/control/SuggestionBoxWebRequestContext.java b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/control/SuggestionBoxWebRequestContext.java index d53320df46..1866016cc9 100644 --- a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/control/SuggestionBoxWebRequestContext.java +++ b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/control/SuggestionBoxWebRequestContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.control; diff --git a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/package-info.java b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/package-info.java index 9aeca98fc0..d8d745f4e0 100644 --- a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/package-info.java +++ b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. * @author mmoquillon */ package org.silverpeas.components.suggestionbox; diff --git a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/AbstractSuggestionBoxResource.java b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/AbstractSuggestionBoxResource.java index 49490e074d..fe0a5ef4e4 100644 --- a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/AbstractSuggestionBoxResource.java +++ b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/AbstractSuggestionBoxResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.web; diff --git a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionBoxResource.java b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionBoxResource.java index 4494a6e86e..879d2d3ca2 100644 --- a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionBoxResource.java +++ b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionBoxResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.web; diff --git a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionBoxResourceURIs.java b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionBoxResourceURIs.java index 3f63d9058b..901a5ba24b 100644 --- a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionBoxResourceURIs.java +++ b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionBoxResourceURIs.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.web; diff --git a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionEntity.java b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionEntity.java index eccd4952a6..6c76e5194e 100644 --- a/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionEntity.java +++ b/suggestionBox/suggestionBox-war/src/main/java/org/silverpeas/components/suggestionbox/web/SuggestionEntity.java @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.suggestionbox.web; diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/WEB-INF/web.xml b/suggestionBox/suggestionBox-war/src/main/webapp/WEB-INF/web.xml index 8fae20de9b..0c58c4eb3f 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/WEB-INF/web.xml +++ b/suggestionBox/suggestionBox-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.com/legal/licensing" + "https://www.silverpeas.org/legal/licensing" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <web-app> diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/check.jsp b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/check.jsp index 224a74f978..98dc83a23d 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/check.jsp +++ b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.com/legal/licensing" + "https://www.silverpeas.org/legal/licensing" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <% diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/directives/suggestionbox-deletion.js b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/directives/suggestionbox-deletion.js index c7909b5c76..7b21b9e6b6 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/directives/suggestionbox-deletion.js +++ b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/directives/suggestionbox-deletion.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ (function() { diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/directives/suggestionbox-validation.js b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/directives/suggestionbox-validation.js index a3eeb95ce9..dbdd52993c 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/directives/suggestionbox-validation.js +++ b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/directives/suggestionbox-validation.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ (function() { diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/services/suggestionbox.js b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/services/suggestionbox.js index 51cc7cb618..a31145841d 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/services/suggestionbox.js +++ b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/services/suggestionbox.js @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ var services = angular.module('silverpeas.services'); diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/suggestionbox.js b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/suggestionbox.js index f5078302a2..108e93e8e3 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/suggestionbox.js +++ b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/javaScript/angularjs/suggestionbox.js @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* The angularjs application with its dependencies */ diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/styleSheets/suggestionBox.css b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/styleSheets/suggestionBox.css index 3a4ca0ba6f..59486967bf 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/styleSheets/suggestionBox.css +++ b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/styleSheets/suggestionBox.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://repository.silverpeas.com/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ .suggestion-title { diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionBox.jsp b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionBox.jsp index fbafee8446..9b90462c4c 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionBox.jsp +++ b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionBox.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.com/legal/licensing" + "https://www.silverpeas.org/legal/licensing" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="check.jsp" %> diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionEdit.jsp b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionEdit.jsp index 49dd6a4ecf..31d2fcbbf9 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionEdit.jsp +++ b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionEdit.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.com/legal/licensing" + "https://www.silverpeas.org/legal/licensing" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="check.jsp" %> diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionList.jsp b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionList.jsp index 215595d2ac..63843a6f34 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionList.jsp +++ b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionList.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="check.jsp" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionView.jsp b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionView.jsp index 8c0cebb814..27fb833664 100644 --- a/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionView.jsp +++ b/suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/suggestionView.jsp @@ -1,5 +1,5 @@ <%@ page import="org.silverpeas.core.notification.user.NotificationContext" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ include file="check.jsp" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/survey/pom.xml b/survey/pom.xml index b188876e7e..b2404018d4 100644 --- a/survey/pom.xml +++ b/survey/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/survey/survey-configuration/pom.xml b/survey/survey-configuration/pom.xml index c45df942c3..14dc0a513e 100644 --- a/survey/survey-configuration/pom.xml +++ b/survey/survey-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>survey</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.survey</groupId> diff --git a/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle.properties b/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle.properties index 632d9e2bc5..cc8421ff99 100644 --- a/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle.properties +++ b/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # SurveyClosingDate = Date de cloture SurveyOpeningDate = Date d'ouverture diff --git a/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_de.properties b/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_de.properties index 870bfe6f83..9d459513b9 100644 --- a/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_de.properties +++ b/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # SurveyClosingDate = Schlussdatum SurveyOpeningDate = \u00d6ffnungsdatum diff --git a/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_en.properties b/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_en.properties index 910631717c..7e68fdbcac 100644 --- a/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_en.properties +++ b/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # SurveyClosingDate = Closing date SurveyOpeningDate = Opening date diff --git a/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_fr.properties b/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_fr.properties index 4e015b9bd9..c337e3cb3e 100644 --- a/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_fr.properties +++ b/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/multilang/surveyBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # SurveyClosingDate = Date de cloture SurveyOpeningDate = Date d'ouverture diff --git a/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/surveySettings.properties b/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/surveySettings.properties index 28cae81119..5500f80542 100644 --- a/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/surveySettings.properties +++ b/survey/survey-configuration/src/main/config/properties/org/silverpeas/survey/surveySettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # imagesSubDirectory = images diff --git a/survey/survey-configuration/src/main/config/properties/org/silverpeas/util/logging/surveyLogging.properties b/survey/survey-configuration/src/main/config/properties/org/silverpeas/util/logging/surveyLogging.properties index 53542a65f3..8ed7cb56c6 100644 --- a/survey/survey-configuration/src/main/config/properties/org/silverpeas/util/logging/surveyLogging.properties +++ b/survey/survey-configuration/src/main/config/properties/org/silverpeas/util/logging/surveyLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/survey/survey-configuration/src/main/config/xmlcomponents/pollingStation.xml b/survey/survey-configuration/src/main/config/xmlcomponents/pollingStation.xml index dd5e996e54..c77125d3e8 100644 --- a/survey/survey-configuration/src/main/config/xmlcomponents/pollingStation.xml +++ b/survey/survey-configuration/src/main/config/xmlcomponents/pollingStation.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/survey/survey-configuration/src/main/config/xmlcomponents/survey.xml b/survey/survey-configuration/src/main/config/xmlcomponents/survey.xml index c19050f46e..a803e8fec0 100644 --- a/survey/survey-configuration/src/main/config/xmlcomponents/survey.xml +++ b/survey/survey-configuration/src/main/config/xmlcomponents/survey.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/survey/survey-library/pom.xml b/survey/survey-library/pom.xml index ef5d7f9fbd..4842cc6d4c 100644 --- a/survey/survey-library/pom.xml +++ b/survey/survey-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>survey</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.survey</groupId> diff --git a/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyContentManager.java b/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyContentManager.java index 3c44f4dc7e..f671f958b0 100644 --- a/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyContentManager.java +++ b/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey; diff --git a/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyException.java b/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyException.java index d55264ea71..95b21e4c9e 100644 --- a/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyException.java +++ b/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey; diff --git a/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyStatistics.java b/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyStatistics.java index 23fa3ba6a7..620de9080d 100644 --- a/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyStatistics.java +++ b/survey/survey-library/src/main/java/org/silverpeas/components/survey/SurveyStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey; diff --git a/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/AbstractSurveyUserNotification.java b/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/AbstractSurveyUserNotification.java index b21f395c7f..616260f7b3 100644 --- a/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/AbstractSurveyUserNotification.java +++ b/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/AbstractSurveyUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey.notification; diff --git a/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/PollingStationInstanceManualUserNotification.java b/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/PollingStationInstanceManualUserNotification.java index dcf1faae8a..815175e663 100644 --- a/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/PollingStationInstanceManualUserNotification.java +++ b/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/PollingStationInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey.notification; diff --git a/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyInstanceManualUserNotification.java b/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyInstanceManualUserNotification.java index 0136e029eb..6880393ce1 100644 --- a/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyInstanceManualUserNotification.java +++ b/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey.notification; diff --git a/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyUserAlertNotification.java b/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyUserAlertNotification.java index 4ce5feca5d..4f6f4d4d71 100644 --- a/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyUserAlertNotification.java +++ b/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyUserAlertNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey.notification; diff --git a/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyUserNotification.java b/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyUserNotification.java index 15e64603f9..d742476e61 100644 --- a/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyUserNotification.java +++ b/survey/survey-library/src/main/java/org/silverpeas/components/survey/notification/SurveyUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey.notification; diff --git a/survey/survey-war/pom.xml b/survey/survey-war/pom.xml index 6e51112755..83a2a4dd7c 100644 --- a/survey/survey-war/pom.xml +++ b/survey/survey-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>survey</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.survey</groupId> diff --git a/survey/survey-war/src/main/java/org/silverpeas/components/survey/SurveyIndexer.java b/survey/survey-war/src/main/java/org/silverpeas/components/survey/SurveyIndexer.java index bee9e7b32a..8cdb0e2e79 100644 --- a/survey/survey-war/src/main/java/org/silverpeas/components/survey/SurveyIndexer.java +++ b/survey/survey-war/src/main/java/org/silverpeas/components/survey/SurveyIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey; diff --git a/survey/survey-war/src/main/java/org/silverpeas/components/survey/control/FileHelper.java b/survey/survey-war/src/main/java/org/silverpeas/components/survey/control/FileHelper.java index 5d4b26aa2b..c402267ded 100644 --- a/survey/survey-war/src/main/java/org/silverpeas/components/survey/control/FileHelper.java +++ b/survey/survey-war/src/main/java/org/silverpeas/components/survey/control/FileHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/survey/survey-war/src/main/java/org/silverpeas/components/survey/control/SurveySessionController.java b/survey/survey-war/src/main/java/org/silverpeas/components/survey/control/SurveySessionController.java index bce4311c59..695e393989 100644 --- a/survey/survey-war/src/main/java/org/silverpeas/components/survey/control/SurveySessionController.java +++ b/survey/survey-war/src/main/java/org/silverpeas/components/survey/control/SurveySessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey.control; @@ -399,10 +399,6 @@ public Collection<String> getUserByQuestion(ResourceReference questionPK) { return users; } - public Collection<QuestionResult> getResultByUser(String userId, ResourceReference questionPK) { - return getQuestionResultService().getUserQuestionResultsToQuestion(userId, questionPK); - } - public Collection<String> getResultByUser(String userId) { Collection<QuestionResult> result = new ArrayList<>(); Collection<String> resultId = new ArrayList<>(); @@ -646,6 +642,21 @@ public void copySurvey(String surveyId) throws SilverpeasException { } } + public boolean isPasteEnabled() throws SilverpeasException { + try { + Collection<ClipboardSelection> clipObjects = getClipboardSelectedObjects(); + for (ClipboardSelection clipObject : clipObjects) { + if (clipObject != null && clipObject.isDataFlavorSupported( + QuestionContainerSelection.QuestionContainerDetailFlavor)) { + return true; + } + } + } catch (Exception e) { + throw new SilverpeasException(e.getMessage(), e); + } + return false; + } + /** * Paste surveys which are in the clipboard selection * @throws Exception @@ -1080,6 +1091,7 @@ private Answer fetchFormFieldParameters(final Parameters parameters, Answer answ parameters.setAnswerCount(item.getString(FileUploadUtil.DEFAULT_ENCODING)); } else if ("SuggestionAllowed".equals(mpName)) { parameters.setSuggestion(item.getString(FileUploadUtil.DEFAULT_ENCODING)); + answer.setIsOpened(StringUtil.getBooleanValue(parameters.getSuggestion())); } else if ("questionStyle".equals(mpName)) { parameters.setStyle(item.getString(FileUploadUtil.DEFAULT_ENCODING)); } else if (mpName.startsWith("answer") || "suggestionLabel".equals(mpName)) { diff --git a/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/GoToSurvey.java b/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/GoToSurvey.java index 7bbda84fc0..ddb4ff5106 100644 --- a/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/GoToSurvey.java +++ b/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/GoToSurvey.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey.servlets; diff --git a/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/RecordParticipation.java b/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/RecordParticipation.java index 260b829d8c..5adb9e35f7 100644 --- a/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/RecordParticipation.java +++ b/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/RecordParticipation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey.servlets; diff --git a/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/SurveyRequestRouter.java b/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/SurveyRequestRouter.java index d6e7cf47b0..2e688fdd6e 100644 --- a/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/SurveyRequestRouter.java +++ b/survey/survey-war/src/main/java/org/silverpeas/components/survey/servlets/SurveyRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,11 +19,11 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -43,7 +43,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.survey.servlets; @@ -147,7 +147,7 @@ public String getDestination(String function, SurveySessionController surveySC, if (function.startsWith("portlet")) { destination = rootDest + "portlet.jsp?Profile=" + flag; } else if (function.startsWith("Main") || function.startsWith("surveyList")) { - // the flag is the best user's profile + request.setAttribute("PasteEnabled", surveySC.isPasteEnabled()); destination = rootDest + "surveyList.jsp?Profile=" + flag; } else if (function.startsWith("SurveyCreation") || function.startsWith("surveyCreator")) { if (flag.equals(SilverpeasRole.admin.toString()) || @@ -333,4 +333,4 @@ private void setCommonDataToDisplayResult(String surveyId, HttpServletRequest re } } } -} \ No newline at end of file +} diff --git a/survey/survey-war/src/main/webapp/WEB-INF/web.xml b/survey/survey-war/src/main/webapp/WEB-INF/web.xml index cd46d3c989..ef9cb03bfd 100644 --- a/survey/survey-war/src/main/webapp/WEB-INF/web.xml +++ b/survey/survey-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <web-app> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/answerResult.jsp b/survey/survey-war/src/main/webapp/survey/jsp/answerResult.jsp index 393d12a89f..e1bbe9b378 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/answerResult.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/answerResult.jsp @@ -2,7 +2,7 @@ <%@ page import="org.silverpeas.core.questioncontainer.container.model.QuestionContainerDetail" %> <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -14,7 +14,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +22,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/checkSurvey.jsp b/survey/survey-war/src/main/webapp/survey/jsp/checkSurvey.jsp index d2dfc33e66..1d7a4de557 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/checkSurvey.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/checkSurvey.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/errorpage.jsp b/survey/survey-war/src/main/webapp/survey/jsp/errorpage.jsp index d62ec7c090..ccc7f9b9d3 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/errorpage.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/errorpage.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/manageQuestions.jsp b/survey/survey-war/src/main/webapp/survey/jsp/manageQuestions.jsp index 62094efc19..7ab74aae5c 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/manageQuestions.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/manageQuestions.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/pollCreator.jsp b/survey/survey-war/src/main/webapp/survey/jsp/pollCreator.jsp index d65db67176..8e04745d52 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/pollCreator.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/pollCreator.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/portlet.jsp b/survey/survey-war/src/main/webapp/survey/jsp/portlet.jsp index 57fa4c89bc..aae9ca01f0 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/portlet.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/questionCreator.jsp b/survey/survey-war/src/main/webapp/survey/jsp/questionCreator.jsp index ebed515381..157fd30758 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/questionCreator.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/questionCreator.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/questionCreatorBis.jsp b/survey/survey-war/src/main/webapp/survey/jsp/questionCreatorBis.jsp index 049f87670d..9dd3e3be23 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/questionCreatorBis.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/questionCreatorBis.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/questionsUpdate.jsp b/survey/survey-war/src/main/webapp/survey/jsp/questionsUpdate.jsp index 5bbbfbaab7..3f17c4e09e 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/questionsUpdate.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/questionsUpdate.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/resultByUser.jsp b/survey/survey-war/src/main/webapp/survey/jsp/resultByUser.jsp index 3026098d96..cfb797b701 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/resultByUser.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/resultByUser.jsp @@ -1,6 +1,6 @@ <%@ page import="org.silverpeas.core.util.SettingBundle" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/styleSheets/survey.css b/survey/survey-war/src/main/webapp/survey/jsp/styleSheets/survey.css index 5b44a715cd..4bbd1af0ac 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/styleSheets/survey.css +++ b/survey/survey-war/src/main/webapp/survey/jsp/styleSheets/survey.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* tableau Doodle */ diff --git a/survey/survey-war/src/main/webapp/survey/jsp/surveyCreator.jsp b/survey/survey-war/src/main/webapp/survey/jsp/surveyCreator.jsp index 906192560d..752b4ff815 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/surveyCreator.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/surveyCreator.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/surveyDetail.jsp b/survey/survey-war/src/main/webapp/survey/jsp/surveyDetail.jsp index 82c4c32447..0d164cad6b 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/surveyDetail.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/surveyDetail.jsp @@ -3,7 +3,7 @@ <%@ page import="org.silverpeas.core.util.SettingBundle" %> <%@ page import="org.silverpeas.core.notification.user.NotificationContext" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -15,7 +15,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,7 +23,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> @@ -86,8 +86,6 @@ //Icons String alertSrc = m_context + "/util/icons/alert.gif"; - String exportSrc = m_context + "/util/icons/export.gif"; - String copySrc = m_context + "util/icons/copy.gif"; String deleteSrc = m_context + "/util/icons/delete.gif"; %> <c:url value="/util/icons/alert.gif" var="alertSrc"></c:url> @@ -445,28 +443,22 @@ function clipboardCopy() { </head> <body> +<view:operationPane> + <fmt:message key="GML.notify" var="notifyUserMsg" /> + <c:set var="notifyUserAction">javaScript:onClick=sp.messager.open('<%= componentId %>', {<%=NotificationContext.CONTRIBUTION_ID%>: '<%=surveyId%>'});</c:set> + <view:operation altText="${notifyUserMsg}" icon="${alertSrc}" action="${notifyUserAction}" /> + + <fmt:message key="GML.copy" var="copyMsg" /> + <view:operation altText="${copyMsg}" icon="${copySrc}" action="javaScript:onClick=clipboardCopy();" /> +</view:operationPane> <view:window> +<view:browseBar extraInformations="<%=survey.getHeader().getTitle()%>" componentId="<%=surveyScc.getComponentId()%>"/> <% - Window window = gef.getWindow(); - BrowseBar browseBar = window.getBrowseBar(); - browseBar.setDomainName(surveyScc.getSpaceLabel()); - browseBar.setComponentName(surveyScc.getComponentLabel(), "surveyList.jsp?Action=View"); - browseBar.setExtraInformation(survey.getHeader().getTitle()); - participated = false; String surveyPart = displayQuestions(survey, Integer.parseInt(roundId), gef, m_context, surveyScc, resources, settings, profile, pollingStationMode, participated); - - // notification - OperationPane operationPane = window.getOperationPane(); - operationPane.addOperation(alertSrc, resources.getString("GML.notify"), - "javaScript:onClick=sp.messager.open('" + componentId + "', {" + NotificationContext.CONTRIBUTION_ID + ": '" + surveyId + "'});"); - - // copier - operationPane.addOperation(copySrc, resources.getString("GML.copy"), - "javaScript:onClick=clipboardCopy()"); - + out.println(surveyPart); %> <view:pdcClassification componentId="<%= componentId %>" contentId="<%= surveyId %>" /> @@ -474,7 +466,6 @@ function clipboardCopy() { </view:window> <% } else if (action.equals("ViewResult")) { - String iconsPath = ResourceLocator.getGeneralSettingBundle().getString("ApplicationURL"); int resultView = survey.getHeader().getResultView(); %> @@ -541,7 +532,7 @@ function clipboardCopy() { } function clipboardCopy() { - top.IdleFrame.location.href = '../..<%=surveyScc.getComponentUrl()%>copy?Id=<%=survey.getHeader().getId()%>'; + top.IdleFrame.location.href = '../..<%=surveyScc.getComponentUrl()%>copy?Id=<%=survey.getHeader().getId()%>'; } function changeScope(mode, participated, surveyId) { @@ -608,9 +599,9 @@ function clipboardCopy() { <% } %> + <fmt:message key="GML.copy" var="copyMsg" /> <view:operation altText="${copyMsg}" icon="${copySrc}" action="javaScript:onClick=clipboardCopy();" /> - </view:operationPane> <view:window> <% diff --git a/survey/survey-war/src/main/webapp/survey/jsp/surveyList.jsp b/survey/survey-war/src/main/webapp/survey/jsp/surveyList.jsp index 9d3403e48c..b3e68b8bc2 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/surveyList.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/surveyList.jsp @@ -3,7 +3,7 @@ <%@ page import="org.silverpeas.core.web.util.viewgenerator.html.operationpanes.OperationPane" %> <%@ page import="org.silverpeas.core.util.WebEncodeHelper" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -15,7 +15,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,7 +23,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> @@ -293,10 +293,10 @@ <% //Retrieve parameters - String action = (String) request.getParameter("Action"); - String profile = (String) request.getParameter("Profile"); - String iconsPath = - ResourceLocator.getGeneralSettingBundle().getString("ApplicationURL"); + String action = request.getParameter("Action"); + String profile = request.getParameter("Profile"); + String iconsPath = ResourceLocator.getGeneralSettingBundle().getString("ApplicationURL"); + boolean pasteEnabled = (Boolean) request.getAttribute("PasteEnabled"); //Icons lockSrc = iconsPath + "/util/icons/checkoutFile.gif"; @@ -448,8 +448,10 @@ function openSPWindow(fonction, windowName){ operationPane.addOperationOfCreation(addSurveySrc, resources.getString("SurveyNewSurvey"), "javaScript:createSurvey()"); } - operationPane.addOperation(resources.getIcon("survey.paste"), resources - .getString("GML.paste"), "javascript:onClick=clipboardPaste()"); + if (pasteEnabled) { + operationPane.addOperation(resources.getIcon("survey.paste"), + resources.getString("GML.paste"), "javascript:onClick=clipboardPaste()"); + } } out.println(window.printBefore()); @@ -519,4 +521,4 @@ function openSPWindow(fonction, windowName){ <view:progressMessage/> </body> -</html> \ No newline at end of file +</html> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/surveySuggestions.jsp b/survey/survey-war/src/main/webapp/survey/jsp/surveySuggestions.jsp index cd9b1edc1d..d236619d0e 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/surveySuggestions.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/surveySuggestions.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/surveyUpdate.jsp b/survey/survey-war/src/main/webapp/survey/jsp/surveyUpdate.jsp index 1f5b796dd3..d4d7a4dbc4 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/surveyUpdate.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/surveyUpdate.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/survey/survey-war/src/main/webapp/survey/jsp/surveyUtils.jsp b/survey/survey-war/src/main/webapp/survey/jsp/surveyUtils.jsp index 3f0db862b7..e5a1a1fbd8 100644 --- a/survey/survey-war/src/main/webapp/survey/jsp/surveyUtils.jsp +++ b/survey/survey-war/src/main/webapp/survey/jsp/surveyUtils.jsp @@ -1029,15 +1029,10 @@ String displayOpenAnswersToQuestion(boolean anonymous, String questionId, Survey if (!saveUser.equals(userId+"-"+participationId)) { r += "<tr><td align=\"left\" width=\"40%\" class=\"displayUserName\"><a href=\"javaScript:onClick=viewResultByUser('"+userId+"');\">"+Encode.javaStringToHtmlString(results.getUser(userId).getDisplayedName())+"</a></td>"; - // rechercher les réponses pour cet utilisateur String value; - //Collection results = surveyScc.getResultByUser(userId, new ResourceReference(question.getPK())); - //Iterator it = results.iterator(); position = 1; - //while (it.hasNext()) - //{ - QuestionResult qr = results.getQuestionResultByQuestion(question.getPK().getId(), userId, Integer.parseInt(participationId)); - //if (qr.getParticipationId() == Integer.parseInt(participationId)) { + List<QuestionResult> qrs = results.getQuestionResultByQuestion(question.getPK().getId(), userId, Integer.parseInt(participationId)); + for (QuestionResult qr : qrs) { value = qr.getAnswerPK().getId(); int valueColonne = (Integer) answerValues.get(value); @@ -1052,9 +1047,8 @@ String displayOpenAnswersToQuestion(boolean anonymous, String questionId, Survey } position = position + 1; } - saveUser = userId+"-"+participationId; - //} - //} + saveUser = userId + "-" + participationId; + } // completer la ligne avec des cases à "vide" while (position <= rang) { diff --git a/webPages/pom.xml b/webPages/pom.xml index 0371889c3f..b2a44a523f 100644 --- a/webPages/pom.xml +++ b/webPages/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/webPages/webPages-configuration/pom.xml b/webPages/webPages-configuration/pom.xml index 8199ed4569..2faf7b7795 100644 --- a/webPages/webPages-configuration/pom.xml +++ b/webPages/webPages-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>webpages</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.webpages</groupId> diff --git a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/util/logging/webpagesLogging.properties b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/util/logging/webpagesLogging.properties index 4e86867c93..f19dbf4f95 100644 --- a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/util/logging/webpagesLogging.properties +++ b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/util/logging/webpagesLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle.properties b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle.properties index 489de7fac0..67699b5ad3 100644 --- a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle.properties +++ b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # webPages.edit = Modifier la page webPages.emptyPage = Page en construction diff --git a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_de.properties b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_de.properties index 34a99904eb..f7ae0bf91a 100644 --- a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_de.properties +++ b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # webPages.edit = Editierseite webPages.emptyPage = Seite in Arbeit diff --git a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_en.properties b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_en.properties index 26c6170ebf..0e88c66def 100644 --- a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_en.properties +++ b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # webPages.edit = Edit the page webPages.emptyPage = Page under construction diff --git a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_fr.properties b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_fr.properties index 28747848aa..85c6b44be3 100644 --- a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_fr.properties +++ b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/multilang/webPagesBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # webPages.edit = Modifier la page webPages.emptyPage = Page en construction diff --git a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/settings/webPagesIcons.properties b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/settings/webPagesIcons.properties index ce3bc8b752..5740196e17 100644 --- a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/settings/webPagesIcons.properties +++ b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/settings/webPagesIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,6 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # webPages.underConstruction = /webPages/jsp/icons/underConst.gif \ No newline at end of file diff --git a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/settings/webPagesSettings.properties b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/settings/webPagesSettings.properties index 1d7d197bbc..20320ad242 100644 --- a/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/settings/webPagesSettings.properties +++ b/webPages/webPages-configuration/src/main/config/properties/org/silverpeas/webpages/settings/webPagesSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # templatePath=${env.SILVERPEAS_HOME}/resources/StringTemplates/components/webpages/ diff --git a/webPages/webPages-configuration/src/main/config/xmlcomponents/webPages.xml b/webPages/webPages-configuration/src/main/config/xmlcomponents/webPages.xml index d3b3d6e828..6b35a39abf 100644 --- a/webPages/webPages-configuration/src/main/config/xmlcomponents/webPages.xml +++ b/webPages/webPages-configuration/src/main/config/xmlcomponents/webPages.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/webPages/webPages-library/pom.xml b/webPages/webPages-library/pom.xml index c64b0f235a..0da3da30a9 100644 --- a/webPages/webPages-library/pom.xml +++ b/webPages/webPages-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>webpages</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.webpages</groupId> diff --git a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesInstancePreDestruction.java b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesInstancePreDestruction.java index 3984294fbf..b224490916 100644 --- a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesInstancePreDestruction.java +++ b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages; diff --git a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesStatistics.java b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesStatistics.java index c75c487474..5fa8b89047 100644 --- a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesStatistics.java +++ b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages; diff --git a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesWysiwygEventListener.java b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesWysiwygEventListener.java index e74d92ffa8..f1e7b2bb0b 100644 --- a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesWysiwygEventListener.java +++ b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/WebPagesWysiwygEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages; diff --git a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/model/WebPagesException.java b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/model/WebPagesException.java index 73f5039d80..2f1c721acb 100644 --- a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/model/WebPagesException.java +++ b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/model/WebPagesException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages.model; diff --git a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/model/WebPagesRuntimeException.java b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/model/WebPagesRuntimeException.java index 8457aa4c19..4a81efe979 100644 --- a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/model/WebPagesRuntimeException.java +++ b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/model/WebPagesRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages.model; diff --git a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesInstanceManualUserNotification.java b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesInstanceManualUserNotification.java index 7bf9ec0b43..520c92a125 100644 --- a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesInstanceManualUserNotification.java +++ b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesInstanceManualUserNotification.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages.notification; diff --git a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesUserAlertNotifier.java b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesUserAlertNotifier.java index 27b67b0714..9aba5dc0be 100644 --- a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesUserAlertNotifier.java +++ b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesUserAlertNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages.notification; diff --git a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesUserNotifier.java b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesUserNotifier.java index 4c3cea74a8..69f084b370 100644 --- a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesUserNotifier.java +++ b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/notification/WebPagesUserNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages.notification; diff --git a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/package-info.java b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/package-info.java index 9b50955622..7d66612979 100644 --- a/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/package-info.java +++ b/webPages/webPages-library/src/main/java/org/silverpeas/components/webpages/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. * @author mmoquillon */ package org.silverpeas.components.webpages; diff --git a/webPages/webPages-war/pom.xml b/webPages/webPages-war/pom.xml index b8896c970c..82f0f3c692 100644 --- a/webPages/webPages-war/pom.xml +++ b/webPages/webPages-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>webpages</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.webpages</groupId> diff --git a/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/WebPagesIndexer.java b/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/WebPagesIndexer.java index d8b6e23b21..cb54e1634e 100644 --- a/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/WebPagesIndexer.java +++ b/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/WebPagesIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages; diff --git a/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/control/WebPagesSessionController.java b/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/control/WebPagesSessionController.java index 9fb9285c53..f70a32d64f 100644 --- a/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/control/WebPagesSessionController.java +++ b/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/control/WebPagesSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages.control; diff --git a/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/package-info.java b/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/package-info.java index 9b50955622..7d66612979 100644 --- a/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/package-info.java +++ b/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. * @author mmoquillon */ package org.silverpeas.components.webpages; diff --git a/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/servlets/WebPagesRequestRouter.java b/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/servlets/WebPagesRequestRouter.java index 0803729884..06d3bad0c3 100644 --- a/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/servlets/WebPagesRequestRouter.java +++ b/webPages/webPages-war/src/main/java/org/silverpeas/components/webpages/servlets/WebPagesRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.webpages.servlets; diff --git a/webPages/webPages-war/src/main/webapp/WEB-INF/web.xml b/webPages/webPages-war/src/main/webapp/WEB-INF/web.xml index cab2829923..0d22559cfa 100644 --- a/webPages/webPages-war/src/main/webapp/WEB-INF/web.xml +++ b/webPages/webPages-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/webPages/webPages-war/src/main/webapp/webPages/jsp/check.jsp b/webPages/webPages-war/src/main/webapp/webPages/jsp/check.jsp index fe5dea03ac..05b471281e 100644 --- a/webPages/webPages-war/src/main/webapp/webPages/jsp/check.jsp +++ b/webPages/webPages-war/src/main/webapp/webPages/jsp/check.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webPages/webPages-war/src/main/webapp/webPages/jsp/display.jsp b/webPages/webPages-war/src/main/webapp/webPages/jsp/display.jsp index 71057c288a..dde213b3aa 100644 --- a/webPages/webPages-war/src/main/webapp/webPages/jsp/display.jsp +++ b/webPages/webPages-war/src/main/webapp/webPages/jsp/display.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/webPages/webPages-war/src/main/webapp/webPages/jsp/editXMLContent.jsp b/webPages/webPages-war/src/main/webapp/webPages/jsp/editXMLContent.jsp index 984d154a30..6779bf6025 100644 --- a/webPages/webPages-war/src/main/webapp/webPages/jsp/editXMLContent.jsp +++ b/webPages/webPages-war/src/main/webapp/webPages/jsp/editXMLContent.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/webPages/webPages-war/src/main/webapp/webPages/jsp/styleSheets/webPages-print.css b/webPages/webPages-war/src/main/webapp/webPages/jsp/styleSheets/webPages-print.css index 57afc8842e..a582415e86 100644 --- a/webPages/webPages-war/src/main/webapp/webPages/jsp/styleSheets/webPages-print.css +++ b/webPages/webPages-war/src/main/webapp/webPages/jsp/styleSheets/webPages-print.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://repository.silverpeas.com/legal/licensing" + * "https://www.silverpeas.org/legal/licensing" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,5 +19,5 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/webSites/pom.xml b/webSites/pom.xml index e9368f2b1f..43f7514c1a 100644 --- a/webSites/pom.xml +++ b/webSites/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/webSites/webSites-configuration/pom.xml b/webSites/webSites-configuration/pom.xml index 1edf41e698..65ef6014fa 100644 --- a/webSites/webSites-configuration/pom.xml +++ b/webSites/webSites-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>websites</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.websites</groupId> diff --git a/webSites/webSites-configuration/src/main/config/migrations/modules/webSites-migration.xml b/webSites/webSites-configuration/src/main/config/migrations/modules/webSites-migration.xml index e1fef352b3..0ee6eddd63 100644 --- a/webSites/webSites-configuration/src/main/config/migrations/modules/webSites-migration.xml +++ b/webSites/webSites-configuration/src/main/config/migrations/modules/webSites-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="webSites" diff --git a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/util/logging/webSitesLogging.properties b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/util/logging/webSitesLogging.properties index 585d8f6449..122cabede6 100644 --- a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/util/logging/webSitesLogging.properties +++ b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/util/logging/webSitesLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle.properties b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle.properties index 86da31d7f6..784d890e42 100644 --- a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle.properties +++ b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # ListeSites = Liste des sites SitePublie = Publi\u00E9 diff --git a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_de.properties b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_de.properties index ae7e429748..5e0fbef70c 100644 --- a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_de.properties +++ b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # ListeSites = Liste der Sites SitePublie = Ver\u00f6ffentlicht diff --git a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_en.properties b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_en.properties index 3adee96f1b..d9ab562cb3 100644 --- a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_en.properties +++ b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # ListeSites = List of websites SitePublie = Published diff --git a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_fr.properties b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_fr.properties index 86da31d7f6..784d890e42 100644 --- a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_fr.properties +++ b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/multilang/webSiteBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # ListeSites = Liste des sites SitePublie = Publi\u00E9 diff --git a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/settings/webSiteSettings.properties b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/settings/webSiteSettings.properties index ec73712868..0fc85e903f 100644 --- a/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/settings/webSiteSettings.properties +++ b/webSites/webSites-configuration/src/main/config/properties/org/silverpeas/webSites/settings/webSiteSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # Machine = diff --git a/webSites/webSites-configuration/src/main/config/xmlcomponents/bookmark.xml b/webSites/webSites-configuration/src/main/config/xmlcomponents/bookmark.xml index 4d82692a21..f649ddcb15 100644 --- a/webSites/webSites-configuration/src/main/config/xmlcomponents/bookmark.xml +++ b/webSites/webSites-configuration/src/main/config/xmlcomponents/bookmark.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/webSites/webSites-configuration/src/main/config/xmlcomponents/webSites.xml b/webSites/webSites-configuration/src/main/config/xmlcomponents/webSites.xml index eeb80991ab..4922efa9d6 100644 --- a/webSites/webSites-configuration/src/main/config/xmlcomponents/webSites.xml +++ b/webSites/webSites-configuration/src/main/config/xmlcomponents/webSites.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/webSites/webSites-library/pom.xml b/webSites/webSites-library/pom.xml index 36972c55ca..b6caf7212b 100644 --- a/webSites/webSites-library/pom.xml +++ b/webSites/webSites-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>websites</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.websites</groupId> diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/BookmarkInstancePostConstruction.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/BookmarkInstancePostConstruction.java index 0207c068fc..baf8ab6bc3 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/BookmarkInstancePostConstruction.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/BookmarkInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/BookmarkInstancePreDestruction.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/BookmarkInstancePreDestruction.java index f20acc632c..6638d55c0b 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/BookmarkInstancePreDestruction.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/BookmarkInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesContentManager.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesContentManager.java index 52f6a33b19..69f0b69b5b 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesContentManager.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesInstancePostConstruction.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesInstancePostConstruction.java index 68b9e4dab8..28f211c62c 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesInstancePostConstruction.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesInstancePreDestruction.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesInstancePreDestruction.java index be39447658..39622e61c6 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesInstancePreDestruction.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesStatistics.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesStatistics.java index e4c081d07d..09a01f0aca 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesStatistics.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/WebSitesStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/DefaultWebSiteService.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/DefaultWebSiteService.java index 7446583a9d..34d080b60e 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/DefaultWebSiteService.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/DefaultWebSiteService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.service; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/WebSiteService.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/WebSiteService.java index 241da324c8..8de2638ea9 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/WebSiteService.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/WebSiteService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.service; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/WebSitesException.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/WebSitesException.java index cc2ea1eda5..8f8cca4be5 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/WebSitesException.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/service/WebSitesException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.service; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/dao/SiteDAO.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/dao/SiteDAO.java index 2fa0d2f19d..8f7829b6a2 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/dao/SiteDAO.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/dao/SiteDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.siteManage.dao; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/FolderDetail.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/FolderDetail.java index ab569a0f6f..c8b74c2f73 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/FolderDetail.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/FolderDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.siteManage.model; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/IconDetail.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/IconDetail.java index 8184617032..6b472b2212 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/IconDetail.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/IconDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.siteManage.model; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/SiteDetail.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/SiteDetail.java index e2068b0efe..fbbc77620c 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/SiteDetail.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/SiteDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.siteManage.model; diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/SitePK.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/SitePK.java index 4f599d0a49..8ebd1ae527 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/SitePK.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/SitePK.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/WebSitesRuntimeException.java b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/WebSitesRuntimeException.java index e8a044f65d..133b4057b5 100644 --- a/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/WebSitesRuntimeException.java +++ b/webSites/webSites-library/src/main/java/org/silverpeas/components/websites/siteManage/model/WebSitesRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.siteManage.model; diff --git a/webSites/webSites-war/pom.xml b/webSites/webSites-war/pom.xml index 2136923779..493485e312 100644 --- a/webSites/webSites-war/pom.xml +++ b/webSites/webSites-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>websites</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.websites</groupId> diff --git a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/BookmarkIndexer.java b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/BookmarkIndexer.java index 3de51276a3..bb867673ca 100644 --- a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/BookmarkIndexer.java +++ b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/BookmarkIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites; diff --git a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/WebSitesIndexer.java b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/WebSitesIndexer.java index debf7fd5dc..86fcf78f32 100644 --- a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/WebSitesIndexer.java +++ b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/WebSitesIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites; diff --git a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/control/WebSiteSessionController.java b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/control/WebSiteSessionController.java index b7e4cb3bad..cdcbe26248 100644 --- a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/control/WebSiteSessionController.java +++ b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/control/WebSiteSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.control; diff --git a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/WebSitesRequestRouter.java b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/WebSitesRequestRouter.java index 29feb17e30..c6983f4fc9 100644 --- a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/WebSitesRequestRouter.java +++ b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/WebSitesRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.servlets; diff --git a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/WebSitesUtil.java b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/WebSitesUtil.java index 68b2fe943f..2f8c0b6ed5 100644 --- a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/WebSitesUtil.java +++ b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/WebSitesUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.servlets; diff --git a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/design/SiteDesignActionHandler.java b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/design/SiteDesignActionHandler.java index 8e5f4dcdcc..71f256c623 100644 --- a/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/design/SiteDesignActionHandler.java +++ b/webSites/webSites-war/src/main/java/org/silverpeas/components/websites/servlets/design/SiteDesignActionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.websites.servlets.design; diff --git a/webSites/webSites-war/src/main/webapp/WEB-INF/web.xml b/webSites/webSites-war/src/main/webapp/WEB-INF/web.xml index 3a734eccb2..9fc5f98509 100644 --- a/webSites/webSites-war/src/main/webapp/WEB-INF/web.xml +++ b/webSites/webSites-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/webSites/webSites-war/src/main/webapp/bookmark/jsp/styleSheets/bookmark.css b/webSites/webSites-war/src/main/webapp/bookmark/jsp/styleSheets/bookmark.css index 055bc10b16..ed07912144 100644 --- a/webSites/webSites-war/src/main/webapp/bookmark/jsp/styleSheets/bookmark.css +++ b/webSites/webSites-war/src/main/webapp/bookmark/jsp/styleSheets/bookmark.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/addPage.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/addPage.jsp index c37dfe53a9..de302a749b 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/addPage.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/addPage.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/addRep.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/addRep.jsp index c5d7b1b4bd..8927e463f6 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/addRep.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/addRep.jsp @@ -3,7 +3,7 @@ <%@ page import="org.silverpeas.core.util.WebEncodeHelper" %> <%@ page import="org.silverpeas.core.util.WebEncodeHelper" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -15,7 +15,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,7 +23,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/addTopic.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/addTopic.jsp index 19fe503912..ad0020f025 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/addTopic.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/addTopic.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/checkScc.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/checkScc.jsp index e5d75df10b..afb01583d4 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/checkScc.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/checkScc.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/classifyDeclassify.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/classifyDeclassify.jsp index 81d595ad1a..b1310ebc0b 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/classifyDeclassify.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/classifyDeclassify.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.components.websites.servlets.WebSitesRequestRouter" %> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/classifySite.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/classifySite.jsp index 35d126f627..8a9ed485cf 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/classifySite.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/classifySite.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/descBookmark.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/descBookmark.jsp index 9215a43d31..220f16b81e 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/descBookmark.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/descBookmark.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/descDesign.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/descDesign.jsp index fe9b4bfd6d..7c630b4f06 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/descDesign.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/descDesign.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/descUpload.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/descUpload.jsp index e4cc4faa75..de66cd88a1 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/descUpload.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/descUpload.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/design.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/design.jsp index 933a984c14..417c4be9a9 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/design.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/design.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/dictionnaireIcones.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/dictionnaireIcones.jsp index 0db3bc58bd..c438aff659 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/dictionnaireIcones.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/dictionnaireIcones.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/javaScript/commons.js b/webSites/webSites-war/src/main/webapp/webSites/jsp/javaScript/commons.js index 2de1e66f1d..2bcfe3df7d 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/javaScript/commons.js +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/javaScript/commons.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ (function() { diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite.jsp index 28eb098f9f..2fe9e33f05 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view" %> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/listSitePortlet.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/listSitePortlet.jsp index 494158bb72..f7e8674729 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/listSitePortlet.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/listSitePortlet.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite_reader.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite_reader.jsp index 7582f8931f..213471c551 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite_reader.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite_reader.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view" %> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite_readerPortlet.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite_readerPortlet.jsp index 7a83b8a955..f122df060c 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite_readerPortlet.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/listSite_readerPortlet.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/manage.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/manage.jsp index 8a3af5bc0d..9c5b4f5617 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/manage.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/manage.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/modifDesc.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/modifDesc.jsp index 238e19e4ba..2b1fc040b5 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/modifDesc.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/modifDesc.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/openSite.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/openSite.jsp index 61820e5c73..050680ce9b 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/openSite.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/openSite.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/openSiteFromSearch.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/openSiteFromSearch.jsp index f21b0b2af1..58494ecfa2 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/openSiteFromSearch.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/openSiteFromSearch.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/organize.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/organize.jsp index 608921e035..4b1df1d936 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/organize.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/organize.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/styleSheets/webSites.css b/webSites/webSites-war/src/main/webapp/webSites/jsp/styleSheets/webSites.css index ba52d41d4d..ab1ef903b2 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/styleSheets/webSites.css +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/styleSheets/webSites.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/suggestionConfirmation.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/suggestionConfirmation.jsp index b591eada60..97c73642a8 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/suggestionConfirmation.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/suggestionConfirmation.jsp @@ -1,5 +1,5 @@ <%-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify ~ it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ ~ GNU Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view" %> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/updatePage.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/updatePage.jsp index df01dbca24..adb426cfcc 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/updatePage.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/updatePage.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.util.StringUtil"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/updateRep.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/updateRep.jsp index e6e5c3c1f1..58160c0b83 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/updateRep.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/updateRep.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/updateTopic.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/updateTopic.jsp index 196f049315..dc69a07f40 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/updateTopic.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/updateTopic.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/uploadFile.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/uploadFile.jsp index 0a4d3bbfa9..6f49054178 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/uploadFile.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/uploadFile.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/util.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/util.jsp index cf17aa9646..637213282b 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/util.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/util.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/verif.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/verif.jsp index 8ad0778367..b93c236e94 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/verif.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/verif.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.util.StringUtil"%> diff --git a/webSites/webSites-war/src/main/webapp/webSites/jsp/verifAjoutPage.jsp b/webSites/webSites-war/src/main/webapp/webSites/jsp/verifAjoutPage.jsp index d7592ed119..9941d55c0d 100644 --- a/webSites/webSites-war/src/main/webapp/webSites/jsp/verifAjoutPage.jsp +++ b/webSites/webSites-war/src/main/webapp/webSites/jsp/verifAjoutPage.jsp @@ -4,7 +4,7 @@ <%@ page import="org.silverpeas.core.web.util.viewgenerator.html.window.Window" %> <%@ page import="org.silverpeas.core.web.http.HttpRequest" %><%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -16,7 +16,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,7 +24,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/whitePages/pom.xml b/whitePages/pom.xml index d92ce449ab..97dabcafe4 100644 --- a/whitePages/pom.xml +++ b/whitePages/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/whitePages/whitePages-configuration/pom.xml b/whitePages/whitePages-configuration/pom.xml index a8d98f7133..956014595f 100644 --- a/whitePages/whitePages-configuration/pom.xml +++ b/whitePages/whitePages-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>whitepages</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.whitepages</groupId> diff --git a/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages.xml b/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages.xml index f98ecd8252..9acd425f6c 100644 --- a/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages.xml +++ b/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/data.xml b/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/data.xml index b1b95fa688..684cadbd95 100644 --- a/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/data.xml +++ b/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/data.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/update.xml b/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/update.xml index 4af56da083..9d80e03371 100644 --- a/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/update.xml +++ b/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/update.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/user.xml b/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/user.xml index 8ee764d947..49828c7c83 100644 --- a/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/user.xml +++ b/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/user.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/view.xml b/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/view.xml index ba688c119b..15bca16f42 100644 --- a/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/view.xml +++ b/whitePages/whitePages-configuration/src/main/config/data/templateRepository/whitePages/view.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/whitePages/whitePages-configuration/src/main/config/migrations/modules/whitePages-migration.xml b/whitePages/whitePages-configuration/src/main/config/migrations/modules/whitePages-migration.xml index 0327a9e59e..8c0eb47ea4 100644 --- a/whitePages/whitePages-configuration/src/main/config/migrations/modules/whitePages-migration.xml +++ b/whitePages/whitePages-configuration/src/main/config/migrations/modules/whitePages-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="whitePages" diff --git a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/util/logging/whitePagesLogging.properties b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/util/logging/whitePagesLogging.properties index ebbdcc011d..dced2212d1 100644 --- a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/util/logging/whitePagesLogging.properties +++ b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/util/logging/whitePagesLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle.properties b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle.properties index f93944dde5..c8c24a0fc9 100644 --- a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle.properties +++ b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # whitePages.groupe = Groupe whitePages.recherche = Recherche d'utilisateurs diff --git a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_de.properties b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_de.properties index 32577cf83e..8b87d11e5b 100644 --- a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_de.properties +++ b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # whitePages.groupe = Gruppe whitePages.recherche = Benutzersuche diff --git a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_en.properties b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_en.properties index 28a0b5d2c6..a2f2267598 100644 --- a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_en.properties +++ b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # whitePages.groupe = Group whitePages.recherche = Search for users diff --git a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_fr.properties b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_fr.properties index f93944dde5..c8c24a0fc9 100644 --- a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_fr.properties +++ b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/multilang/whitePagesBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # whitePages.groupe = Groupe whitePages.recherche = Recherche d'utilisateurs diff --git a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/settings.properties b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/settings.properties index 2ed5db6ce8..062c9d669f 100644 --- a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/settings.properties +++ b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/settings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,6 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # whitePages.genericUserId=48 \ No newline at end of file diff --git a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/template.properties b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/template.properties index 057173a600..4a1d3e2a27 100644 --- a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/template.properties +++ b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/template.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,6 +19,6 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # templateDir = ${sys.SILVERPEAS_DATA_HOME}/templateRepository/ diff --git a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/whitePagesIcons.properties b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/whitePagesIcons.properties index b065896a6f..7d078c92a3 100644 --- a/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/whitePagesIcons.properties +++ b/whitePages/whitePages-configuration/src/main/config/properties/org/silverpeas/whitePages/settings/whitePagesIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # whitePages.newCard = /util/icons/create-action/add-user.png whitePages.delCard = /util/icons/whitePages_to_del.gif diff --git a/whitePages/whitePages-configuration/src/main/config/xmlcomponents/whitePages.xml b/whitePages/whitePages-configuration/src/main/config/xmlcomponents/whitePages.xml index d7cb3a176f..a00968ccb3 100644 --- a/whitePages/whitePages-configuration/src/main/config/xmlcomponents/whitePages.xml +++ b/whitePages/whitePages-configuration/src/main/config/xmlcomponents/whitePages.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/whitePages/whitePages-library/pom.xml b/whitePages/whitePages-library/pom.xml index 6a14669384..5840336229 100644 --- a/whitePages/whitePages-library/pom.xml +++ b/whitePages/whitePages-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>whitepages</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.whitepages</groupId> diff --git a/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/dao/SearchFieldDaoIT.java b/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/dao/SearchFieldDaoIT.java index 4e08ebc784..3f77674cee 100644 --- a/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/dao/SearchFieldDaoIT.java +++ b/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/dao/SearchFieldDaoIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.dao; diff --git a/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/service/WhitePagesServiceIT.java b/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/service/WhitePagesServiceIT.java index b6a43a04be..2ab7a7698d 100644 --- a/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/service/WhitePagesServiceIT.java +++ b/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/service/WhitePagesServiceIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.service; diff --git a/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/service/WhitePagesServiceProviderIT.java b/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/service/WhitePagesServiceProviderIT.java index b5cde908ff..7484e090ae 100644 --- a/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/service/WhitePagesServiceProviderIT.java +++ b/whitePages/whitePages-library/src/integration-test/java/org/silverpeas/components/whitepages/service/WhitePagesServiceProviderIT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.service; diff --git a/whitePages/whitePages-library/src/integration-test/resources/arquillian.xml b/whitePages/whitePages-library/src/integration-test/resources/arquillian.xml index fc68726bc5..ebca1fdd1e 100644 --- a/whitePages/whitePages-library/src/integration-test/resources/arquillian.xml +++ b/whitePages/whitePages-library/src/integration-test/resources/arquillian.xml @@ -1,6 +1,6 @@ <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <arquillian xmlns="http://jboss.org/schema/arquillian" @@ -37,8 +37,8 @@ <container qualifier="wildfly-managed" default="true"> <configuration> <property name="serverConfig">standalone-full.xml</property> - <property name="startupTimeoutInSeconds">120</property> - <property name="allowConnectingToRunningServer">true</property> + <property name="startupTimeoutInSeconds">300</property> + <property name="allowConnectingToRunningServer">false</property> <property name="javaVmArguments">-Xms512M -Xmx2G -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m</property> <!-- uncomment it for debugging integration test --> <!-- @@ -46,4 +46,4 @@ --> </configuration> </container> -</arquillian> \ No newline at end of file +</arquillian> diff --git a/whitePages/whitePages-library/src/integration-test/resources/org/silverpeas/classifyEngine/ClassifyEngine.properties b/whitePages/whitePages-library/src/integration-test/resources/org/silverpeas/classifyEngine/ClassifyEngine.properties index ade1786d88..547e415563 100644 --- a/whitePages/whitePages-library/src/integration-test/resources/org/silverpeas/classifyEngine/ClassifyEngine.properties +++ b/whitePages/whitePages-library/src/integration-test/resources/org/silverpeas/classifyEngine/ClassifyEngine.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -19,6 +19,6 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # MaxAxis = 50 \ No newline at end of file diff --git a/whitePages/whitePages-library/src/integration-test/resources/test-ds.xml b/whitePages/whitePages-library/src/integration-test/resources/test-ds.xml index eaddc0bfad..55db3df229 100644 --- a/whitePages/whitePages-library/src/integration-test/resources/test-ds.xml +++ b/whitePages/whitePages-library/src/integration-test/resources/test-ds.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <datasources xmlns="http://www.jboss.org/ironjacamar/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesException.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesException.java index 3067ff0909..8815b22730 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesException.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesInstancePostConstruction.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesInstancePostConstruction.java index 94c9d2f404..9d1e8d9d0d 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesInstancePostConstruction.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesInstancePreDestruction.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesInstancePreDestruction.java index 1c57b6c394..e2dae91207 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesInstancePreDestruction.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesInstancePreDestruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesStatistics.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesStatistics.java index d905cdf4fb..99803764fa 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesStatistics.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/WhitePagesStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/CardHeader.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/CardHeader.java index 6ac7769dc5..8af681b2ad 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/CardHeader.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/CardHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.control; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/CardManager.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/CardManager.java index 942b35338c..95038a3869 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/CardManager.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/CardManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.control; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/WhitePagesContentManager.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/WhitePagesContentManager.java index ea6310b7be..7bfb6ff5ca 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/WhitePagesContentManager.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/control/WhitePagesContentManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.control; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/dao/SearchFieldDao.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/dao/SearchFieldDao.java index c0a12beb16..aae0cd1c6a 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/dao/SearchFieldDao.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/dao/SearchFieldDao.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.dao; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/dao/SearchFieldDaoImpl.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/dao/SearchFieldDaoImpl.java index fcf2749610..c0715661d4 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/dao/SearchFieldDaoImpl.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/dao/SearchFieldDaoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.dao; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/Card.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/Card.java index 15584470f9..3a7abff36a 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/Card.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/Card.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.model; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SearchField.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SearchField.java index 919bac167f..f43bbe054c 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SearchField.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SearchField.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.model; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SearchFieldsType.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SearchFieldsType.java index 189ec46383..6a2539628e 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SearchFieldsType.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SearchFieldsType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.model; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SilverCard.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SilverCard.java index d58b49ebfb..36c0df34f0 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SilverCard.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/SilverCard.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.model; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/WhitePagesCard.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/WhitePagesCard.java index f761da9362..415af1711f 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/WhitePagesCard.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/model/WhitePagesCard.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.model; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/record/UserRecord.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/record/UserRecord.java index ebbffb1c20..13556b690f 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/record/UserRecord.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/record/UserRecord.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.record; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/record/UserTemplate.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/record/UserTemplate.java index 09af4a2fbf..c96d161a06 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/record/UserTemplate.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/record/UserTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.record; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/DefaultWhitePagesService.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/DefaultWhitePagesService.java index 8756200f50..f611faacdf 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/DefaultWhitePagesService.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/DefaultWhitePagesService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.service; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/MixedSearchService.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/MixedSearchService.java index bda5556fca..773caf87a0 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/MixedSearchService.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/MixedSearchService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.service; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/MixedSearchServiceImpl.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/MixedSearchServiceImpl.java index baf4de3b50..2389c40d98 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/MixedSearchServiceImpl.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/MixedSearchServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.service; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/SearchFieldComparator.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/SearchFieldComparator.java index d9d1b22a71..d31d1c4ca4 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/SearchFieldComparator.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/SearchFieldComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.service; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/WhitePageServiceProvider.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/WhitePageServiceProvider.java index 286fb67e8a..202622fefd 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/WhitePageServiceProvider.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/WhitePageServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.service; diff --git a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/WhitePagesService.java b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/WhitePagesService.java index 7ea4c1e316..9ae6ae8a11 100644 --- a/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/WhitePagesService.java +++ b/whitePages/whitePages-library/src/main/java/org/silverpeas/components/whitepages/service/WhitePagesService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.service; diff --git a/whitePages/whitePages-war/pom.xml b/whitePages/whitePages-war/pom.xml index 4217aefd91..626168a598 100644 --- a/whitePages/whitePages-war/pom.xml +++ b/whitePages/whitePages-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>whitepages</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.whitepages</groupId> diff --git a/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/WhitePagesIndexer.java b/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/WhitePagesIndexer.java index b68dbde208..12b5873cbb 100644 --- a/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/WhitePagesIndexer.java +++ b/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/WhitePagesIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/control/WhitePagesSessionController.java b/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/control/WhitePagesSessionController.java index 52488094f8..f5dea58e34 100644 --- a/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/control/WhitePagesSessionController.java +++ b/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/control/WhitePagesSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.control; diff --git a/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/filters/ComponentRequestRouterFilter.java b/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/filters/ComponentRequestRouterFilter.java index 7a6b06de86..6a46cc7bac 100644 --- a/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/filters/ComponentRequestRouterFilter.java +++ b/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/filters/ComponentRequestRouterFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.filters; diff --git a/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/filters/LoginFilter.java b/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/filters/LoginFilter.java index b057197cff..10e7259fa5 100644 --- a/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/filters/LoginFilter.java +++ b/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/filters/LoginFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.filters; diff --git a/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/servlets/WhitePagesRequestRouter.java b/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/servlets/WhitePagesRequestRouter.java index 523080a10e..ee94ddcae3 100644 --- a/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/servlets/WhitePagesRequestRouter.java +++ b/whitePages/whitePages-war/src/main/java/org/silverpeas/components/whitepages/servlets/WhitePagesRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.whitepages.servlets; diff --git a/whitePages/whitePages-war/src/main/webapp/WEB-INF/web.xml b/whitePages/whitePages-war/src/main/webapp/WEB-INF/web.xml index 6f93098894..bb30d0c7eb 100644 --- a/whitePages/whitePages-war/src/main/webapp/WEB-INF/web.xml +++ b/whitePages/whitePages-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/checkWhitePages.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/checkWhitePages.jsp index d28708444e..6ec3618801 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/checkWhitePages.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/checkWhitePages.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/closeUpdate.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/closeUpdate.jsp index d8ee7570a7..af214df7e6 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/closeUpdate.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/closeUpdate.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/consultCard.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/consultCard.jsp index d8f7d6c041..241d7f829c 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/consultCard.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/consultCard.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/createCard.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/createCard.jsp index 62f14f1ee9..af6a12c8a8 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/createCard.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/createCard.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/dynamicFieldsChoice.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/dynamicFieldsChoice.jsp index 7b1ce28ff6..490189fb07 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/dynamicFieldsChoice.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/dynamicFieldsChoice.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.contribution.content.form.FieldTemplate"%> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/dynamicSearch.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/dynamicSearch.jsp index 93d7009f27..f3e015b954 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/dynamicSearch.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/dynamicSearch.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/errorIdentity.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/errorIdentity.jsp index 456897b033..01719eab11 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/errorIdentity.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/errorIdentity.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.core.web.util.viewgenerator.html.buttonpanes.ButtonPane" %> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/errorSelectUser.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/errorSelectUser.jsp index 758ce6643c..cce817c863 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/errorSelectUser.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/errorSelectUser.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/notifyExpert.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/notifyExpert.jsp index 5bcbe56e22..540d9280b4 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/notifyExpert.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/notifyExpert.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.core.web.util.viewgenerator.html.buttonpanes.ButtonPane" %> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/portlet.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/portlet.jsp index 6511b0309e..dbb65ca266 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/portlet.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/portlet.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/updateCard.jsp b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/updateCard.jsp index 7ebd20912c..7085ec8914 100644 --- a/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/updateCard.jsp +++ b/whitePages/whitePages-war/src/main/webapp/whitePages/jsp/updateCard.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have received a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/yellowpages/pom.xml b/yellowpages/pom.xml index e05521515a..5ee26c50b0 100644 --- a/yellowpages/pom.xml +++ b/yellowpages/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas</groupId> <artifactId>components</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components</groupId> diff --git a/yellowpages/yellowpages-configuration/pom.xml b/yellowpages/yellowpages-configuration/pom.xml index 6577686b29..7e392640cd 100644 --- a/yellowpages/yellowpages-configuration/pom.xml +++ b/yellowpages/yellowpages-configuration/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>yellowpages</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.yellowpages</groupId> diff --git a/yellowpages/yellowpages-configuration/src/main/config/migrations/modules/yellowpages-migration.xml b/yellowpages/yellowpages-configuration/src/main/config/migrations/modules/yellowpages-migration.xml index a0af253e12..a14db16ae8 100644 --- a/yellowpages/yellowpages-configuration/src/main/config/migrations/modules/yellowpages-migration.xml +++ b/yellowpages/yellowpages-configuration/src/main/config/migrations/modules/yellowpages-migration.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - ~ Copyright (C) 2000 - 2020 Silverpeas + ~ Copyright (C) 2000 - 2024 Silverpeas ~ ~ This program is free software: you can redistribute it and/or modify it under the terms of the ~ GNU Affero General Public License as published by the Free Software Foundation, either version 3 @@ -10,14 +10,14 @@ ~ redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS") ~ applications as described in Silverpeas's FLOSS exception. You should have received a copy of the ~ text describing the FLOSS exception, and it is also available here: - ~ "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + ~ "https://www.silverpeas.org/legal/floss_exception.html" ~ ~ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without ~ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ Affero General Public License for more details. ~ ~ You should have received a copy of the GNU Affero General Public License along with this program. - ~ If not, see <http://www.gnu.org/licenses/>. + ~ If not, see <https://www.gnu.org/licenses/>. --> <migration module="yellowpages" diff --git a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/util/logging/yellowpagesLogging.properties b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/util/logging/yellowpagesLogging.properties index ca104b449f..8a45096c99 100644 --- a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/util/logging/yellowpagesLogging.properties +++ b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/util/logging/yellowpagesLogging.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle.properties b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle.properties index 60253315d5..321456ed7f 100644 --- a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle.properties +++ b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # BBarconsultManager = Identit\u00e9 diff --git a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_de.properties b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_de.properties index a8f1ce3902..53baf04d2a 100644 --- a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_de.properties +++ b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_de.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have received a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # BBarconsultManager = Identität diff --git a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_en.properties b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_en.properties index f157062672..4d2edcfe9e 100644 --- a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_en.properties +++ b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_en.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # BBarconsultManager = ID diff --git a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_fr.properties b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_fr.properties index 60253315d5..321456ed7f 100644 --- a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_fr.properties +++ b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # BBarconsultManager = Identit\u00e9 diff --git a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/settings/yellowpagesIcons.properties b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/settings/yellowpagesIcons.properties index 63d8f4141a..3d85172ae5 100644 --- a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/settings/yellowpagesIcons.properties +++ b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/settings/yellowpagesIcons.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # yellowpages.aide = /util/icons/info.gif diff --git a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/settings/yellowpagesSettings.properties b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/settings/yellowpagesSettings.properties index 6967a1e8f9..7e24dc98fa 100644 --- a/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/settings/yellowpagesSettings.properties +++ b/yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/settings/yellowpagesSettings.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2000 - 2020 Silverpeas +# Copyright (C) 2000 - 2024 Silverpeas # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ # Open Source Software ("FLOSS") applications as described in Silverpeas's # FLOSS exception. You should have recieved a copy of the text describing # the FLOSS exception, and it is also available here: -# "http://www.silverpeas.org/docs/core/legal/floss_exception.html" +# "https://www.silverpeas.org/legal/floss_exception.html" # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # popupWidth = 640 popupHeight = 480 diff --git a/yellowpages/yellowpages-configuration/src/main/config/xmlcomponents/yellowpages.xml b/yellowpages/yellowpages-configuration/src/main/config/xmlcomponents/yellowpages.xml index a6c77cb9a5..b7736c2716 100644 --- a/yellowpages/yellowpages-configuration/src/main/config/xmlcomponents/yellowpages.xml +++ b/yellowpages/yellowpages-configuration/src/main/config/xmlcomponents/yellowpages.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> <WAComponent xmlns="http://silverpeas.org/xml/ns/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://silverpeas.org/xml/ns/component http://www.silverpeas.org/xsd/component.xsd"> diff --git a/yellowpages/yellowpages-library/pom.xml b/yellowpages/yellowpages-library/pom.xml index 404b569724..eaef97319b 100644 --- a/yellowpages/yellowpages-library/pom.xml +++ b/yellowpages/yellowpages-library/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>yellowpages</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.yellowpages</groupId> diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/GroupEventListener.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/GroupEventListener.java index 355c359799..5b350d520b 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/GroupEventListener.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/GroupEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesComponentSettings.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesComponentSettings.java index dad9f40c4e..b9cbbc1da5 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesComponentSettings.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesComponentSettings.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have recieved a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesException.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesException.java index c45d8ccac7..0cadfa885e 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesException.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesInstancePostConstruction.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesInstancePostConstruction.java index 0d6c6fceba..7fe5cd165e 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesInstancePostConstruction.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesInstancePostConstruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * <p> * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * <p> * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * <p> * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesStatistics.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesStatistics.java index d576e84915..fc883a25e0 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesStatistics.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/YellowpagesStatistics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/dao/GroupDAO.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/dao/GroupDAO.java index 41807e7415..4aa0c55b8c 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/dao/GroupDAO.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/dao/GroupDAO.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.dao; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/TopicDetail.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/TopicDetail.java index f76e941804..e2df1e3b19 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/TopicDetail.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/TopicDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.model; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/UserCompleteContact.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/UserCompleteContact.java index 28a196e939..5c763fafd7 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/UserCompleteContact.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/UserCompleteContact.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.model; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/UserContact.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/UserContact.java index c2a747444b..890535af88 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/UserContact.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/UserContact.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.model; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/YellowPagesGroupDetail.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/YellowPagesGroupDetail.java index 64a0078389..717d2994ce 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/YellowPagesGroupDetail.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/YellowPagesGroupDetail.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.model; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/YellowpagesRuntimeException.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/YellowpagesRuntimeException.java index 43acc8257d..ef60ac8810 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/YellowpagesRuntimeException.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/model/YellowpagesRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.model; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/service/DefaultYellowpagesService.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/service/DefaultYellowpagesService.java index f68337ebc8..727d23094a 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/service/DefaultYellowpagesService.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/service/DefaultYellowpagesService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.service; diff --git a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/service/YellowpagesService.java b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/service/YellowpagesService.java index d3cb85ccbd..e5e5b68401 100644 --- a/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/service/YellowpagesService.java +++ b/yellowpages/yellowpages-library/src/main/java/org/silverpeas/components/yellowpages/service/YellowpagesService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.service; diff --git a/yellowpages/yellowpages-war/pom.xml b/yellowpages/yellowpages-war/pom.xml index 881d022110..5c84ef9af0 100644 --- a/yellowpages/yellowpages-war/pom.xml +++ b/yellowpages/yellowpages-war/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.silverpeas.components</groupId> <artifactId>yellowpages</artifactId> - <version>6.2-SNAPSHOT</version> + <version>6.2.4-SNAPSHOT</version> </parent> <groupId>org.silverpeas.components.yellowpages</groupId> diff --git a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/ImportReport.java b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/ImportReport.java index 9058831af6..13829936ab 100644 --- a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/ImportReport.java +++ b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/ImportReport.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages; diff --git a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/YellowpagesIndexer.java b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/YellowpagesIndexer.java index 799801d567..273957da4d 100644 --- a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/YellowpagesIndexer.java +++ b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/YellowpagesIndexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages; diff --git a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/control/DisplayContactsHelper.java b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/control/DisplayContactsHelper.java index 6e510c5d70..e2805eef61 100644 --- a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/control/DisplayContactsHelper.java +++ b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/control/DisplayContactsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.control; diff --git a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/control/YellowpagesSessionController.java b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/control/YellowpagesSessionController.java index e9ffff1aeb..4fdeaa0fbe 100644 --- a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/control/YellowpagesSessionController.java +++ b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/control/YellowpagesSessionController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.control; diff --git a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/servlets/YellowpagesActionAccessController.java b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/servlets/YellowpagesActionAccessController.java index bccbc6372b..7e88563e43 100644 --- a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/servlets/YellowpagesActionAccessController.java +++ b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/servlets/YellowpagesActionAccessController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.servlets; diff --git a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/servlets/YellowpagesRequestRouter.java b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/servlets/YellowpagesRequestRouter.java index 2d3211850e..1110a6e1ad 100644 --- a/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/servlets/YellowpagesRequestRouter.java +++ b/yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/servlets/YellowpagesRequestRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package org.silverpeas.components.yellowpages.servlets; diff --git a/yellowpages/yellowpages-war/src/main/webapp/WEB-INF/tags/silverpeas/yellowpages/contactView.tag b/yellowpages/yellowpages-war/src/main/webapp/WEB-INF/tags/silverpeas/yellowpages/contactView.tag index 70af04b12b..04e7d66702 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/WEB-INF/tags/silverpeas/yellowpages/contactView.tag +++ b/yellowpages/yellowpages-war/src/main/webapp/WEB-INF/tags/silverpeas/yellowpages/contactView.tag @@ -1,5 +1,5 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ tag language="java" pageEncoding="UTF-8" %> diff --git a/yellowpages/yellowpages-war/src/main/webapp/WEB-INF/web.xml b/yellowpages/yellowpages-war/src/main/webapp/WEB-INF/web.xml index fb36cdc8d9..0bad84598e 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/WEB-INF/web.xml +++ b/yellowpages/yellowpages-war/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -13,7 +13,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --> diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/TopicLink.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/TopicLink.jsp index 9b013473fa..35a3d3d9be 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/TopicLink.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/TopicLink.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.components.yellowpages.control.YellowpagesSessionController" %> diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/addTopic.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/addTopic.jsp index a743e1d29f..4857cfce32 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/addTopic.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/addTopic.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.contribution.template.publication.PublicationTemplate"%> diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/annuaire.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/annuaire.jsp index 34e30892c3..4306423cf4 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/annuaire.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/annuaire.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.components.yellowpages.control.DisplayContactsHelper" %> @@ -130,13 +130,11 @@ } function contactGoToUserInTopic(id, topic) { - windowName = "contactWindow"; - windowParams = - "directories=0,menubar=0,toolbar=0,alwaysRaised, scrollbars=yes, resizable=yes"; width = <%=resources.getSetting("popupWidth", 600)%>; height = <%=resources.getSetting("popupHeight", 480)%>; url = "ContactView?ContactId=" + id + "&TopicId=" + topic; - jQuery.popup.load(url).show('free', { + window.contactPopup = jQuery.popup.load(url); + window.contactPopup.show('free', { title : 'Contact', width : width, height : height }); } diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/checkYellowpages.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/checkYellowpages.jsp index 5fda0c0504..0d7edcbcc3 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/checkYellowpages.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/checkYellowpages.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/contact.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/contact.jsp index 63815e1302..e96380f875 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/contact.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/contact.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.contact.model.CompleteContact" %> @@ -73,6 +73,20 @@ </c:when> <c:otherwise> <view:link href="/util/styleSheets/fieldset.css"/> - <yellowpagesTags:contactView contact="<%=contact%>" userLanguage="<%=resources.getLanguage()%>" formView="<%=formView%>" context="<%=context%>"/> + <view:link href="styleSheets/printContact.css"/> + <script type="text/javascript"> + function closePopup() { + window.contactPopup.close(); + } + </script> + <div id="printSection"> + <yellowpagesTags:contactView contact="<%=contact%>" userLanguage="<%=resources.getLanguage()%>" formView="<%=formView%>" context="<%=context%>"/> + </div> + <view:buttonPane> + <fmt:message key="GML.print" var="labelPrint"/> + <fmt:message key="GML.close" var="labelClose"/> + <view:button label="${labelPrint}" action="javascript:window.print()"/> + <view:button label="${labelClose}" action="javascript:closePopup()"/> + </view:buttonPane> </c:otherwise> </c:choose> \ No newline at end of file diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/contactManager.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/contactManager.jsp index fcf187fcb0..abd0e84a67 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/contactManager.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/contactManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/groupManager.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/groupManager.jsp index ee594f33fd..e20a479472 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/groupManager.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/groupManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/importCSV.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/importCSV.jsp index 00eb1942eb..885f266975 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/importCSV.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/importCSV.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.components.yellowpages.ImportReport"%> diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/modelUsedList.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/modelUsedList.jsp index 7505a27572..2099543b30 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/modelUsedList.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/modelUsedList.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/printContactList.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/printContactList.jsp index 8b257c4a20..bd321b6867 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/printContactList.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/printContactList.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.components.yellowpages.control.DisplayContactsHelper" %> diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/styleSheets/printContact.css b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/styleSheets/printContact.css new file mode 100644 index 0000000000..d01e54d280 --- /dev/null +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/styleSheets/printContact.css @@ -0,0 +1,16 @@ +@media print { + body * { + visibility:hidden; + } + #printSection, #printSection * { + visibility:visible; + } + + #printSection { + height: 100%; + position: fixed; + top: 0; + left: 0; + margin: 0; + } +} \ No newline at end of file diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/styleSheets/yellowpages.css b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/styleSheets/yellowpages.css index 930b481224..cccde382d9 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/styleSheets/yellowpages.css +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/styleSheets/yellowpages.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 - 2020 Silverpeas + * Copyright (C) 2000 - 2024 Silverpeas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -11,7 +11,7 @@ * Open Source Software ("FLOSS") applications as described in Silverpeas's * FLOSS exception. You should have received a copy of the text describing * the FLOSS exception, and it is also available here: - * "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + * "https://www.silverpeas.org/legal/floss_exception.html" * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ #searchButton a { diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/topicManager.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/topicManager.jsp index 9ec1d3dcee..ddfd46c820 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/topicManager.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/topicManager.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@page import="org.silverpeas.core.util.URLUtil"%> diff --git a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/userFull.jsp b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/userFull.jsp index 27d7ca20c8..d3e4c07001 100644 --- a/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/userFull.jsp +++ b/yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/userFull.jsp @@ -1,6 +1,6 @@ <%-- - Copyright (C) 2000 - 2020 Silverpeas + Copyright (C) 2000 - 2024 Silverpeas This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as @@ -12,7 +12,7 @@ Open Source Software ("FLOSS") applications as described in Silverpeas's FLOSS exception. You should have recieved a copy of the text describing the FLOSS exception, and it is also available here: - "http://www.silverpeas.org/docs/core/legal/floss_exception.html" + "https://www.silverpeas.org/legal/floss_exception.html" This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. --%> <%@ page import="org.silverpeas.core.admin.user.model.UserFull" %>