From 25f364bd8e3da8b167831f7e18cbf4c8b20b9e3a Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Wed, 15 Oct 2014 13:45:07 +0200 Subject: [PATCH] Changed License to Bioforsk Open Source License --- nb-configuration.xml | 18 +++++++++++ .../model/naerstadmodel/NaerstadModel.java | 20 ++++++------- .../NaerstadModelBackgroundDataMatrix.java | 20 ++++++------- .../vips/model/naerstadmodel/texts.properties | 30 +++++++++---------- .../naerstadmodel/NaerstadModelTest.java | 18 +++++------ 5 files changed, 62 insertions(+), 44 deletions(-) create mode 100644 nb-configuration.xml diff --git a/nb-configuration.xml b/nb-configuration.xml new file mode 100644 index 0000000..33e441e --- /dev/null +++ b/nb-configuration.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-shared-configuration> + <!-- +This file contains additional configuration written by modules in the NetBeans IDE. +The configuration is intended to be shared among all the users of project and +therefore it is assumed to be part of version control checkout. +Without this configuration present, some functionality in the IDE may be limited or fail altogether. +--> + <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1"> + <!-- +Properties that influence various parts of the IDE, especially code formatting and the like. +You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up. +That way multiple projects can share the same settings (useful for formatting rules for example). +Any value defined here will override the pom.xml file value but is only applicable to the current project. +--> + <netbeans.hint.license>bioforsk_open_source_license.ftl</netbeans.hint.license> + </properties> +</project-shared-configuration> diff --git a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java b/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java index e610b78..6853634 100644 --- a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java +++ b/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>. + * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * - * This file is part of VIPS/NaerstadModel. - * VIPS/NaerstadModel 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. + * This file is part of NaerstadModel. + * NaerstadModel is free software: you can redistribute it and/or modify + * 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. * - * VIPS/NaerstadModel is distributed in the hope that it will be useful, + * NaerstadModel 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 VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with NaerstadModel. If not, see <http://www.bioforsk.no/licenses/>. * */ package no.bioforsk.vips.model.naerstadmodel; diff --git a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java b/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java index f986c07..4dae7f3 100644 --- a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java +++ b/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java @@ -1,19 +1,19 @@ /* - * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>. + * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * - * This file is part of VIPS/NaerstadModel. - * VIPS/NaerstadModel 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. + * This file is part of NaerstadModel. + * NaerstadModel is free software: you can redistribute it and/or modify + * 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. * - * VIPS/NaerstadModel is distributed in the hope that it will be useful, + * NaerstadModel 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 VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with NaerstadModel. If not, see <http://www.bioforsk.no/licenses/>. * */ package no.bioforsk.vips.model.naerstadmodel; diff --git a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties b/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties index 0acefe4..21f6d43 100644 --- a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties +++ b/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties @@ -1,19 +1,19 @@ -# Copyright (C) 2014 Bioforsk -# -# This file is part of VIPS/NaerstadModel +# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. # -# VIPS/NaerstadModel 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. -# -# VIPS/NaerstadModel 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 VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>. +# This file is part of NaerstadModel. +# NaerstadModel is free software: you can redistribute it and/or modify +# 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. +# +# NaerstadModel 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 +# Bioforsk Open Source License for more details. +# +# You should have received a copy of the Bioforsk Open Source License +# along with NaerstadModel. If not, see <http://www.bioforsk.no/licenses/>. +# name=Naerstad Model diff --git a/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java b/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java index 9911ce8..965dd50 100644 --- a/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java +++ b/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java @@ -1,19 +1,19 @@ /* * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * - * This file is part of VIPS/NaerstadModel. - * VIPS/NaerstadModel 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. + * This file is part of NaerstadModel. + * NaerstadModel is free software: you can redistribute it and/or modify + * 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. * - * VIPS/NaerstadModel is distributed in the hope that it will be useful, + * NaerstadModel 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 VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with NaerstadModel. If not, see <http://www.bioforsk.no/licenses/>. * */ -- GitLab