From b6f2af7db9414acd86fe74fbdaea40ef435d80f1 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Wed, 15 Oct 2014 13:27:22 +0200 Subject: [PATCH] Changed License to Bioforsk Open Source License --- nb-configuration.xml | 18 +++++++++++++++++ .../applescabmodel/AppleScabCalculations.java | 20 +++++++++---------- .../model/applescabmodel/AppleScabModel.java | 20 +++++++++---------- .../AscosporeMaturityTable.java | 20 +++++++++---------- .../vips/model/applescabmodel/MillsTable.java | 20 +++++++++---------- .../model/applescabmodel/MillsTableKey.java | 20 +++++++++---------- .../applescabmodel/AppleScabModelTest.java | 20 +++++++++---------- 7 files changed, 78 insertions(+), 60 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/applescabmodel/AppleScabCalculations.java b/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabCalculations.java index ab1234b..2a20ce1 100644 --- a/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabCalculations.java +++ b/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabCalculations.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/AppleScabModel. - * VIPS/AppleScabModel 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 AppleScabModel. + * AppleScabModel 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/AppleScabModel is distributed in the hope that it will be useful, + * AppleScabModel 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/AppleScabModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with AppleScabModel. If not, see <http://www.bioforsk.no/licenses/>. * */ package no.bioforsk.vips.model.applescabmodel; diff --git a/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java b/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java index 7ba5f20..3521898 100644 --- a/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.java +++ b/src/main/java/no/bioforsk/vips/model/applescabmodel/AppleScabModel.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/AppleScabModel. - * VIPS/AppleScabModel 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 AppleScabModel. + * AppleScabModel 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/AppleScabModel is distributed in the hope that it will be useful, + * AppleScabModel 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/AppleScabModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with AppleScabModel. If not, see <http://www.bioforsk.no/licenses/>. * */ package no.bioforsk.vips.model.applescabmodel; diff --git a/src/main/java/no/bioforsk/vips/model/applescabmodel/AscosporeMaturityTable.java b/src/main/java/no/bioforsk/vips/model/applescabmodel/AscosporeMaturityTable.java index 8e05131..9f87341 100644 --- a/src/main/java/no/bioforsk/vips/model/applescabmodel/AscosporeMaturityTable.java +++ b/src/main/java/no/bioforsk/vips/model/applescabmodel/AscosporeMaturityTable.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/AppleScabModel. - * VIPS/AppleScabModel 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 AppleScabModel. + * AppleScabModel 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/AppleScabModel is distributed in the hope that it will be useful, + * AppleScabModel 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/AppleScabModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with AppleScabModel. If not, see <http://www.bioforsk.no/licenses/>. * */ package no.bioforsk.vips.model.applescabmodel; diff --git a/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTable.java b/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTable.java index 05b1cf1..9e18dac 100644 --- a/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTable.java +++ b/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTable.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/AppleScabModel. - * VIPS/AppleScabModel 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 AppleScabModel. + * AppleScabModel 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/AppleScabModel is distributed in the hope that it will be useful, + * AppleScabModel 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/AppleScabModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with AppleScabModel. If not, see <http://www.bioforsk.no/licenses/>. * */ package no.bioforsk.vips.model.applescabmodel; diff --git a/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTableKey.java b/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTableKey.java index 6f649f2..fdc1224 100644 --- a/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTableKey.java +++ b/src/main/java/no/bioforsk/vips/model/applescabmodel/MillsTableKey.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/AppleScabModel. - * VIPS/AppleScabModel 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 AppleScabModel. + * AppleScabModel 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/AppleScabModel is distributed in the hope that it will be useful, + * AppleScabModel 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/AppleScabModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with AppleScabModel. If not, see <http://www.bioforsk.no/licenses/>. * */ package no.bioforsk.vips.model.applescabmodel; diff --git a/src/test/java/no/bioforsk/vips/model/applescabmodel/AppleScabModelTest.java b/src/test/java/no/bioforsk/vips/model/applescabmodel/AppleScabModelTest.java index 38c0acf..fa1b206 100644 --- a/src/test/java/no/bioforsk/vips/model/applescabmodel/AppleScabModelTest.java +++ b/src/test/java/no/bioforsk/vips/model/applescabmodel/AppleScabModelTest.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/AppleScabModel. - * VIPS/AppleScabModel 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 AppleScabModel. + * AppleScabModel 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/AppleScabModel is distributed in the hope that it will be useful, + * AppleScabModel 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/AppleScabModel. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the Bioforsk Open Source License + * along with AppleScabModel. If not, see <http://www.bioforsk.no/licenses/>. * */ -- GitLab