From 05c050dde981883c57b9fea31d0fbb8d7433f681 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Wed, 15 Oct 2014 13:31:58 +0200 Subject: [PATCH] Changed License to Bioforsk Open Source License --- .../no/bioforsk/vips/core/service/ModelResource.java | 12 ++++++------ .../vips/coremanager/service/ManagerResource.java | 12 ++++++------ .../no/bioforsk/vips/entity/ModelConfiguration.java | 12 ++++++------ src/main/java/no/bioforsk/vips/entity/Result.java | 12 ++++++------ .../java/no/bioforsk/vips/entity/ResultImpl.java | 12 ++++++------ src/main/java/no/bioforsk/vips/entity/Weather.java | 12 ++++++------ .../no/bioforsk/vips/entity/WeatherObservation.java | 12 ++++++------ src/main/java/no/bioforsk/vips/i18n/I18nImpl.java | 12 ++++++------ .../java/no/bioforsk/vips/i18n/LanguageUtil.java | 12 ++++++------ .../vips/model/ConfigValidationException.java | 12 ++++++------ src/main/java/no/bioforsk/vips/model/Model.java | 12 ++++++------ .../vips/model/ModelExcecutionException.java | 12 ++++++------ src/main/java/no/bioforsk/vips/model/ModelId.java | 12 ++++++------ src/main/java/no/bioforsk/vips/util/ArrayUtil.java | 12 ++++++------ .../java/no/bioforsk/vips/util/CommonNamespaces.java | 12 ++++++------ src/main/java/no/bioforsk/vips/util/DateMap.java | 12 ++++++------ .../java/no/bioforsk/vips/util/ExceptionUtil.java | 12 ++++++------ .../vips/util/InvalidAggregationTypeException.java | 12 ++++++------ src/main/java/no/bioforsk/vips/util/JSONUtil.java | 12 ++++++------ .../java/no/bioforsk/vips/util/MD5Encrypter.java | 12 ++++++------ src/main/java/no/bioforsk/vips/util/ServletUtil.java | 12 ++++++------ .../java/no/bioforsk/vips/util/WeatherElements.java | 12 ++++++------ .../vips/util/WeatherObservationListException.java | 12 ++++++------ src/main/java/no/bioforsk/vips/util/WeatherUtil.java | 12 ++++++------ src/main/java/no/bioforsk/vips/util/WebUtil.java | 12 ++++++------ src/test/java/no/bioforsk/vips/common/AppTest.java | 12 ++++++------ .../java/no/bioforsk/vips/util/WeatherUtilTest.java | 12 ++++++------ 27 files changed, 162 insertions(+), 162 deletions(-) diff --git a/src/main/java/no/bioforsk/vips/core/service/ModelResource.java b/src/main/java/no/bioforsk/vips/core/service/ModelResource.java index a9403c4..21c7bd7 100644 --- a/src/main/java/no/bioforsk/vips/core/service/ModelResource.java +++ b/src/main/java/no/bioforsk/vips/core/service/ModelResource.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java index e7eb0ec..032c4c6 100644 --- a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java +++ b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java b/src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java index f9ff1e7..8feac07 100644 --- a/src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java +++ b/src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/entity/Result.java b/src/main/java/no/bioforsk/vips/entity/Result.java index d500428..eebbe24 100644 --- a/src/main/java/no/bioforsk/vips/entity/Result.java +++ b/src/main/java/no/bioforsk/vips/entity/Result.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/entity/ResultImpl.java b/src/main/java/no/bioforsk/vips/entity/ResultImpl.java index a436e05..3eec8c3 100644 --- a/src/main/java/no/bioforsk/vips/entity/ResultImpl.java +++ b/src/main/java/no/bioforsk/vips/entity/ResultImpl.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/entity/Weather.java b/src/main/java/no/bioforsk/vips/entity/Weather.java index 65dc38a..58504fb 100644 --- a/src/main/java/no/bioforsk/vips/entity/Weather.java +++ b/src/main/java/no/bioforsk/vips/entity/Weather.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/entity/WeatherObservation.java b/src/main/java/no/bioforsk/vips/entity/WeatherObservation.java index 110697f..caeca82 100644 --- a/src/main/java/no/bioforsk/vips/entity/WeatherObservation.java +++ b/src/main/java/no/bioforsk/vips/entity/WeatherObservation.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/i18n/I18nImpl.java b/src/main/java/no/bioforsk/vips/i18n/I18nImpl.java index 9feceda..a5c8290 100644 --- a/src/main/java/no/bioforsk/vips/i18n/I18nImpl.java +++ b/src/main/java/no/bioforsk/vips/i18n/I18nImpl.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java b/src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java index e730f4d..c22ddec 100644 --- a/src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java +++ b/src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/model/ConfigValidationException.java b/src/main/java/no/bioforsk/vips/model/ConfigValidationException.java index 95ee574..14ea85f 100644 --- a/src/main/java/no/bioforsk/vips/model/ConfigValidationException.java +++ b/src/main/java/no/bioforsk/vips/model/ConfigValidationException.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/model/Model.java b/src/main/java/no/bioforsk/vips/model/Model.java index 573313d..c44d041 100644 --- a/src/main/java/no/bioforsk/vips/model/Model.java +++ b/src/main/java/no/bioforsk/vips/model/Model.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java b/src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java index efc58f5..6d26ea1 100644 --- a/src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java +++ b/src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/model/ModelId.java b/src/main/java/no/bioforsk/vips/model/ModelId.java index 3c34864..793c1e7 100644 --- a/src/main/java/no/bioforsk/vips/model/ModelId.java +++ b/src/main/java/no/bioforsk/vips/model/ModelId.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/ArrayUtil.java b/src/main/java/no/bioforsk/vips/util/ArrayUtil.java index 640c8d1..1fd774b 100644 --- a/src/main/java/no/bioforsk/vips/util/ArrayUtil.java +++ b/src/main/java/no/bioforsk/vips/util/ArrayUtil.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java b/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java index 0ab3f08..c3d60bb 100644 --- a/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java +++ b/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/DateMap.java b/src/main/java/no/bioforsk/vips/util/DateMap.java index a1655cd..8bf098e 100644 --- a/src/main/java/no/bioforsk/vips/util/DateMap.java +++ b/src/main/java/no/bioforsk/vips/util/DateMap.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/ExceptionUtil.java b/src/main/java/no/bioforsk/vips/util/ExceptionUtil.java index 6b74372..d0fb384 100644 --- a/src/main/java/no/bioforsk/vips/util/ExceptionUtil.java +++ b/src/main/java/no/bioforsk/vips/util/ExceptionUtil.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java b/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java index af9ed70..980015d 100644 --- a/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java +++ b/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/JSONUtil.java b/src/main/java/no/bioforsk/vips/util/JSONUtil.java index 2df4528..b826966 100644 --- a/src/main/java/no/bioforsk/vips/util/JSONUtil.java +++ b/src/main/java/no/bioforsk/vips/util/JSONUtil.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/MD5Encrypter.java b/src/main/java/no/bioforsk/vips/util/MD5Encrypter.java index 7c32fb9..266dff5 100644 --- a/src/main/java/no/bioforsk/vips/util/MD5Encrypter.java +++ b/src/main/java/no/bioforsk/vips/util/MD5Encrypter.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/ServletUtil.java b/src/main/java/no/bioforsk/vips/util/ServletUtil.java index 0388a8f..3b1e160 100644 --- a/src/main/java/no/bioforsk/vips/util/ServletUtil.java +++ b/src/main/java/no/bioforsk/vips/util/ServletUtil.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/WeatherElements.java b/src/main/java/no/bioforsk/vips/util/WeatherElements.java index 2411ec5..2fd6dd6 100644 --- a/src/main/java/no/bioforsk/vips/util/WeatherElements.java +++ b/src/main/java/no/bioforsk/vips/util/WeatherElements.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java b/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java index 979386e..8646aca 100644 --- a/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java +++ b/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/WeatherUtil.java b/src/main/java/no/bioforsk/vips/util/WeatherUtil.java index c2fa764..e44152a 100644 --- a/src/main/java/no/bioforsk/vips/util/WeatherUtil.java +++ b/src/main/java/no/bioforsk/vips/util/WeatherUtil.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/main/java/no/bioforsk/vips/util/WebUtil.java b/src/main/java/no/bioforsk/vips/util/WebUtil.java index ef5d23e..29fed4c 100644 --- a/src/main/java/no/bioforsk/vips/util/WebUtil.java +++ b/src/main/java/no/bioforsk/vips/util/WebUtil.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/test/java/no/bioforsk/vips/common/AppTest.java b/src/test/java/no/bioforsk/vips/common/AppTest.java index 42723eb..caf7a31 100644 --- a/src/test/java/no/bioforsk/vips/common/AppTest.java +++ b/src/test/java/no/bioforsk/vips/common/AppTest.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ diff --git a/src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java b/src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java index 2a56692..2a37203 100644 --- a/src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java +++ b/src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java @@ -3,17 +3,17 @@ * * This file is part of VIPSCommon. * VIPSCommon 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. + * it under the terms of the Bioforsk Open Source License as published by + * Bioforsk, either version 1 of the License, or (at your option) any + * later version. * * VIPSCommon 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. + * Bioforsk Open Source License for more details. * - * You should have received a copy of the GNU Affero General Public License - * along with VIPSCommon. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>. * */ -- GitLab