branch develop updated (ac39b3f -> b785358)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from ac39b3f bascule sur la derniere version rc de nuiton-csv new b785358 update file headers The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b7853585aaa2fc56d1bfd8a0947e3537b52d1c10 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 17 14:48:56 2015 +0100 update file headers Summary of changes: coselmar-bundle/src/license/THIRD-PARTY.properties | 21 +++++++++++++++++++++ .../src/license/THIRD-PARTY.properties | 21 +++++++++++++++++++++ .../coselmar/beans/DocumentSearchExample.java | 22 ++++++++++++++++++++++ .../fr/ifremer/coselmar/beans/SearchExample.java | 22 ++++++++++++++++++++++ .../coselmar/persistence/FixedH2Dialect.java | 22 ++++++++++++++++++++++ .../i18n/coselmar-persistence_en_GB.properties | 21 +++++++++++++++++++++ .../i18n/coselmar-persistence_fr_FR.properties | 21 +++++++++++++++++++++ coselmar-rest/src/license/THIRD-PARTY.properties | 21 +++++++++++++++++++++ .../java/fr/ifremer/coselmar/beans/CloudWord.java | 22 ++++++++++++++++++++++ .../coselmar/beans/QuestionExportModel.java | 22 ++++++++++++++++++++++ .../lucene/misc/HighFreqTermsMultiFields.java | 22 ++++++++++++++++++++++ .../i18n/coselmar-services_en_GB.properties | 21 +++++++++++++++++++++ .../i18n/coselmar-services_fr_FR.properties | 21 +++++++++++++++++++++ 13 files changed, 279 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit b7853585aaa2fc56d1bfd8a0947e3537b52d1c10 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 17 14:48:56 2015 +0100 update file headers --- coselmar-bundle/src/license/THIRD-PARTY.properties | 21 +++++++++++++++++++++ .../src/license/THIRD-PARTY.properties | 21 +++++++++++++++++++++ .../coselmar/beans/DocumentSearchExample.java | 22 ++++++++++++++++++++++ .../fr/ifremer/coselmar/beans/SearchExample.java | 22 ++++++++++++++++++++++ .../coselmar/persistence/FixedH2Dialect.java | 22 ++++++++++++++++++++++ .../i18n/coselmar-persistence_en_GB.properties | 21 +++++++++++++++++++++ .../i18n/coselmar-persistence_fr_FR.properties | 21 +++++++++++++++++++++ coselmar-rest/src/license/THIRD-PARTY.properties | 21 +++++++++++++++++++++ .../java/fr/ifremer/coselmar/beans/CloudWord.java | 22 ++++++++++++++++++++++ .../coselmar/beans/QuestionExportModel.java | 22 ++++++++++++++++++++++ .../lucene/misc/HighFreqTermsMultiFields.java | 22 ++++++++++++++++++++++ .../i18n/coselmar-services_en_GB.properties | 21 +++++++++++++++++++++ .../i18n/coselmar-services_fr_FR.properties | 21 +++++++++++++++++++++ 13 files changed, 279 insertions(+) diff --git a/coselmar-bundle/src/license/THIRD-PARTY.properties b/coselmar-bundle/src/license/THIRD-PARTY.properties index 752502f..6dff4fb 100644 --- a/coselmar-bundle/src/license/THIRD-PARTY.properties +++ b/coselmar-bundle/src/license/THIRD-PARTY.properties @@ -1,3 +1,24 @@ +### +# #%L +# Coselmar :: Bundle +# %% +# Copyright (C) 2014 - 2015 Ifremer, Code Lutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : diff --git a/coselmar-persistence/src/license/THIRD-PARTY.properties b/coselmar-persistence/src/license/THIRD-PARTY.properties index 26a30ef..f6510f7 100644 --- a/coselmar-persistence/src/license/THIRD-PARTY.properties +++ b/coselmar-persistence/src/license/THIRD-PARTY.properties @@ -1,3 +1,24 @@ +### +# #%L +# Coselmar :: Persistence +# %% +# Copyright (C) 2014 - 2015 Ifremer, Code Lutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java index 7c72c61..d63ac3b 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java @@ -1,5 +1,27 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Persistence + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.coselmar.persistence.SearchRequestBean; import fr.ifremer.coselmar.persistence.entity.Document; diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java index c8548d3..029767f 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java @@ -1,5 +1,27 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Persistence + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaEntity; import java.io.Serializable; diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/FixedH2Dialect.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/FixedH2Dialect.java index 7c08931..cdbd159 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/FixedH2Dialect.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/FixedH2Dialect.java @@ -1,5 +1,27 @@ package fr.ifremer.coselmar.persistence; +/* + * #%L + * Coselmar :: Persistence + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.sql.Types; import java.sql.Types; diff --git a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties index 4710e08..5d77ecd 100644 --- a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties +++ b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties @@ -1,2 +1,23 @@ +### +# #%L +# Coselmar :: Persistence +# %% +# Copyright (C) 2014 - 2015 Ifremer, Code Lutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### coselmar.configuration.data.directory= coselmar.configuration.index.directory= diff --git a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties index 4710e08..5d77ecd 100644 --- a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties +++ b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties @@ -1,2 +1,23 @@ +### +# #%L +# Coselmar :: Persistence +# %% +# Copyright (C) 2014 - 2015 Ifremer, Code Lutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### coselmar.configuration.data.directory= coselmar.configuration.index.directory= diff --git a/coselmar-rest/src/license/THIRD-PARTY.properties b/coselmar-rest/src/license/THIRD-PARTY.properties index ee2d3a2..19dd806 100644 --- a/coselmar-rest/src/license/THIRD-PARTY.properties +++ b/coselmar-rest/src/license/THIRD-PARTY.properties @@ -1,3 +1,24 @@ +### +# #%L +# Coselmar :: Rest Services +# %% +# Copyright (C) 2014 - 2015 Ifremer, Code Lutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/CloudWord.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/CloudWord.java index 8e5523f..5837b08 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/CloudWord.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/CloudWord.java @@ -1,5 +1,27 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Rest Services + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.Serializable; /** diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionExportModel.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionExportModel.java index ac37bc0..27f03a9 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionExportModel.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionExportModel.java @@ -1,5 +1,27 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Rest Services + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Joiner; import org.nuiton.csv.Common; import org.nuiton.csv.ValueFormatter; diff --git a/coselmar-rest/src/main/java/org/apache/lucene/misc/HighFreqTermsMultiFields.java b/coselmar-rest/src/main/java/org/apache/lucene/misc/HighFreqTermsMultiFields.java index 525cc6a..203fa5d 100644 --- a/coselmar-rest/src/main/java/org/apache/lucene/misc/HighFreqTermsMultiFields.java +++ b/coselmar-rest/src/main/java/org/apache/lucene/misc/HighFreqTermsMultiFields.java @@ -1,5 +1,27 @@ package org.apache.lucene.misc; +/* + * #%L + * Coselmar :: Rest Services + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/coselmar-rest/src/main/resources/i18n/coselmar-services_en_GB.properties b/coselmar-rest/src/main/resources/i18n/coselmar-services_en_GB.properties index 01ee9f0..95fd07f 100644 --- a/coselmar-rest/src/main/resources/i18n/coselmar-services_en_GB.properties +++ b/coselmar-rest/src/main/resources/i18n/coselmar-services_en_GB.properties @@ -1,3 +1,24 @@ +### +# #%L +# Coselmar :: Rest Services +# %% +# Copyright (C) 2014 - 2015 Ifremer, Code Lutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### coselmar.service.mail.UserAccountCreatedMail.subject=[Coselmar] Account creation %s coselmar.service.mail.PasswordChangedMail.subject=[Coselmar] Password has been changed coselmar.service.mail.LostPasswordMail.subject=[Coselmar] New password diff --git a/coselmar-rest/src/main/resources/i18n/coselmar-services_fr_FR.properties b/coselmar-rest/src/main/resources/i18n/coselmar-services_fr_FR.properties index 8b48da6..1b4ace2 100644 --- a/coselmar-rest/src/main/resources/i18n/coselmar-services_fr_FR.properties +++ b/coselmar-rest/src/main/resources/i18n/coselmar-services_fr_FR.properties @@ -1,3 +1,24 @@ +### +# #%L +# Coselmar :: Rest Services +# %% +# Copyright (C) 2014 - 2015 Ifremer, Code Lutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### coselmar.service.mail.UserAccountCreatedMail.subject=[Coselmar] Création du compte %s coselmar.service.mail.PasswordChangedMail.subject=[Coselmar] Mot de passe modifié coselmar.service.mail.LostPasswordMail.subject=[Coselmar] Nouveau mot de passe -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm