Skip to content
Snippets Groups Projects
Commit aaddbf15 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Refactoring everything Bioforsk -> NIBIO

parent 6d932d6a
No related branches found
No related tags found
No related merge requests found
BIOFORSK OPEN SOURCE LICENSE V.1.0 (2014) NIBIO OPEN SOURCE LICENSE V.1.0 (2014)
PREAMBLE AND ADDITIONAL TERMS PREAMBLE AND ADDITIONAL TERMS
The original licensor is the Norwegian Institute for Agricultural and The original licensor is the Norwegian Institute for Agricultural and
Environmental Research, registered in Norway with registration number 988 983 Environmental Research, registered in Norway with registration number 988 983
837, and business address NO-1430 ÅS, NORWAY, hereafter referred to as 837, and business address NO-1430 ÅS, NORWAY, hereafter referred to as
"BIOFORSK". "NIBIO".
This BIOFORSK OPEN SOURCE LICENSE V.1.0 (2014), in short the BIOFORSK Open This NIBIO OPEN SOURCE LICENSE V.1.0 (2014), in short the NIBIO Open
Source License, is based on the GNU Affero General Public License, version 3. Source License, is based on the GNU Affero General Public License, version 3.
All of the terms and conditions of the GNU Affero General Public License, All of the terms and conditions of the GNU Affero General Public License,
version 3, have been set out below, save the below mentioned additional version 3, have been set out below, save the below mentioned additional
...@@ -15,26 +15,26 @@ prevailing terms that have priority over the terms otherwise identical to the ...@@ -15,26 +15,26 @@ prevailing terms that have priority over the terms otherwise identical to the
GNU Affero General Public License, version 3, and that Section 0 ("This GNU Affero General Public License, version 3, and that Section 0 ("This
License" definition changed), 13 ("version 3 of the GNU General Public License" License" definition changed), 13 ("version 3 of the GNU General Public License"
replaced by "this License") and 14 ("The Free Software Foundation" replaced by replaced by "this License") and 14 ("The Free Software Foundation" replaced by
"BIOFORSK" and "GNU Affero General Public License" replaced by "License") have "NIBIO" and "GNU Affero General Public License" replaced by "License") have
been adjusted as a consequence of this. been adjusted as a consequence of this.
ADDITONAL PREVAILING TERMS ADDITONAL PREVAILING TERMS
(a) The BIOFORSK Open Source License regulates the BIOFORSK VIPS Platform (a) The NIBIO Open Source License regulates the NIBIO VIPS Platform
software, an Internet based system enabling prediction of infection risk of software, an Internet based system enabling prediction of infection risk of
plant diseases, pests and weeds. The BIOFORSK Open Source License DOES NOT plant diseases, pests and weeds. The NIBIO Open Source License DOES NOT
INCLUDE the specific forecasting models, neither their algorithms nor their INCLUDE the specific forecasting models, neither their algorithms nor their
implementation to be used by the BIOFORSK VIPS Platform. You are free to implementation to be used by the NIBIO VIPS Platform. You are free to
implement any other forecasting model to be used by the BIOFORSK VIPS Platform, implement any other forecasting model to be used by the NIBIO VIPS Platform,
regardless of license terms at your own responsibility. regardless of license terms at your own responsibility.
(b) This license is governed by Norwegian law, as far as any party or third (b) This license is governed by Norwegian law, as far as any party or third
party purports or sets forward any claim towards BIOFORSK. Any claims towards party purports or sets forward any claim towards NIBIO. Any claims towards
BIOFORSK shall be solved by the exclusive venue of Oslo City Courts, Norway. NIBIO shall be solved by the exclusive venue of Oslo City Courts, Norway.
This paragraph is not applicable for claims only between any later parties to This paragraph is not applicable for claims only between any later parties to
this license. this license.
(c) By entering into this agreement you also agree to indemnify BIOFORSK and (c) By entering into this agreement you also agree to indemnify NIBIO and
its employees / consultants / board, for any claims of liability related to its employees / consultants / board, for any claims of liability related to
this license set forward by yourself or any party deviating its rights from you. this license set forward by yourself or any party deviating its rights from you.
...@@ -44,17 +44,17 @@ this license set forward by yourself or any party deviating its rights from you. ...@@ -44,17 +44,17 @@ this license set forward by yourself or any party deviating its rights from you.
This file is part of <application name>. <application name> is free This file is part of <application name>. <application name> is free
software: you can redistribute it and/or modify it under the terms of software: you can redistribute it and/or modify it under the terms of
the Bioforsk Open Source License as published by Bioforsk, either the NIBIO Open Source License as published by NIBIO, either
version 1 of the License, or (at your option) any later version. version 1 of the License, or (at your option) any later version.
<application name> is distributed in the hope that it will be useful, <application name> is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Bioforsk Open Source License for more details. NIBIO Open Source License for more details.
You should have received a copy of the Bioforsk Open Source License You should have received a copy of the NIBIO Open Source License
along with <application name>. If not, see along with <application name>. If not, see
<http://www.bioforsk.no/licenses/>. <http://www.nibio.no/licenses/>.
It is also recommended that you add information on how to contact you by It is also recommended that you add information on how to contact you by
electronic and paper mail. electronic and paper mail.
...@@ -63,7 +63,7 @@ this license set forward by yourself or any party deviating its rights from you. ...@@ -63,7 +63,7 @@ this license set forward by yourself or any party deviating its rights from you.
2. 0. Definitions. 2. 0. Definitions.
"This License" refers to BIOFORSK Open Source License v.1.0 (2014). "This License" refers to NIBIO Open Source License v.1.0 (2014).
"Copyright" also means copyright-like laws that apply to other kinds of "Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks. works, such as semiconductor masks.
...@@ -562,7 +562,7 @@ but the work with which it is combined will remain governed by version ...@@ -562,7 +562,7 @@ but the work with which it is combined will remain governed by version
16. 14. Revised Versions of this License. 16. 14. Revised Versions of this License.
BIOFORSK may publish revised and/or new versions of the License from time to NIBIO may publish revised and/or new versions of the License from time to
time. Such new versions will be similar in spirit to the present version, but time. Such new versions will be similar in spirit to the present version, but
may differ in detail to address new problems or concerns. may differ in detail to address new problems or concerns.
...@@ -570,8 +570,8 @@ may differ in detail to address new problems or concerns. ...@@ -570,8 +570,8 @@ may differ in detail to address new problems or concerns.
Program specifies that a certain numbered version of the License "or any later Program specifies that a certain numbered version of the License "or any later
version" applies to it, you have the option of following the terms and version" applies to it, you have the option of following the terms and
conditions either of that numbered version or of any later version published by conditions either of that numbered version or of any later version published by
BIOFORSK. If the Program does not specify a version number of the License, you NIBIO. If the Program does not specify a version number of the License, you
may choose any version ever published by the BIOFORSK. may choose any version ever published by the NIBIO.
If the Program specifies that a proxy can decide which future If the Program specifies that a proxy can decide which future
versions of the License can be used, that proxy's public statement of versions of the License can be used, that proxy's public statement of
......
...@@ -13,6 +13,6 @@ You can copy and paste the single properties, into the pom.xml file and the IDE ...@@ -13,6 +13,6 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
That way multiple projects can share the same settings (useful for formatting rules for example). 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. 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> <netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license>
</properties> </properties>
</project-shared-configuration> </project-shared-configuration>
<?xml version="1.0" encoding="UTF-8"?> <?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/xsd/maven-4.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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>no.bioforsk.vips.model</groupId> <groupId>no.nibio.vips.model</groupId>
<artifactId>OatFloweringModel</artifactId> <artifactId>OatFloweringModel</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>no.bioforsk.vips.common</groupId> <groupId>no.nibio.vips.common</groupId>
<artifactId>VIPSCommon</artifactId> <artifactId>VIPSCommon</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
......
/* /*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
* *
* This file is part of OatFloweringModel. * This file is part of OatFloweringModel.
* OatFloweringModel is free software: you can redistribute it and/or modify * OatFloweringModel is free software: you can redistribute it and/or modify
* it under the terms of the Bioforsk Open Source License as published by * it under the terms of the NIBIO Open Source License as published by
* Bioforsk, either version 1 of the License, or (at your option) any * NIBIO, either version 1 of the License, or (at your option) any
* later version. * later version.
* *
* OatFloweringModel is distributed in the hope that it will be useful, * OatFloweringModel is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* Bioforsk Open Source License for more details. * NIBIO Open Source License for more details.
* *
* You should have received a copy of the Bioforsk Open Source License * You should have received a copy of the NIBIO Open Source License
* along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>. * along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>.
* *
*/ */
package no.bioforsk.vips.model.oatfloweringmodel; package no.nibio.vips.model.oatfloweringmodel;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
...@@ -28,22 +28,22 @@ import java.util.Collections; ...@@ -28,22 +28,22 @@ import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.TimeZone; import java.util.TimeZone;
import no.bioforsk.vips.entity.ModelConfiguration; import no.nibio.vips.entity.ModelConfiguration;
import no.bioforsk.vips.entity.Result; import no.nibio.vips.entity.Result;
import no.bioforsk.vips.entity.ResultImpl; import no.nibio.vips.entity.ResultImpl;
import no.bioforsk.vips.entity.WeatherObservation; import no.nibio.vips.entity.WeatherObservation;
import no.bioforsk.vips.i18n.I18nImpl; import no.nibio.vips.i18n.I18nImpl;
import no.bioforsk.vips.model.ConfigValidationException; import no.nibio.vips.model.ConfigValidationException;
import no.bioforsk.vips.model.Model; import no.nibio.vips.model.Model;
import no.bioforsk.vips.model.ModelExcecutionException; import no.nibio.vips.model.ModelExcecutionException;
import no.bioforsk.vips.model.ModelId; import no.nibio.vips.model.ModelId;
import no.bioforsk.vips.util.WeatherElements; import no.nibio.vips.util.WeatherElements;
import no.bioforsk.vips.util.WeatherUtil; import no.nibio.vips.util.WeatherUtil;
/** /**
* @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a> * @copyright 2014 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@bioforsk.no> * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/ */
public class OatFloweringModel extends I18nImpl implements Model{ public class OatFloweringModel extends I18nImpl implements Model{
...@@ -55,7 +55,7 @@ public class OatFloweringModel extends I18nImpl implements Model{ ...@@ -55,7 +55,7 @@ public class OatFloweringModel extends I18nImpl implements Model{
public OatFloweringModel() { public OatFloweringModel() {
// Setting the file name of the resource bundle // Setting the file name of the resource bundle
super("no.bioforsk.vips.model.oatfloweringmodel.texts"); super("no.nibio.vips.model.oatfloweringmodel.texts");
} }
@Override @Override
...@@ -131,26 +131,26 @@ public class OatFloweringModel extends I18nImpl implements Model{ ...@@ -131,26 +131,26 @@ public class OatFloweringModel extends I18nImpl implements Model{
@Override @Override
public String getLicense() { public String getLicense() {
return "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. \n" + return "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. \n" +
"\n" + "\n" +
"This file is part of OatFloweringModel. \n" + "This file is part of OatFloweringModel. \n" +
"OatFloweringModel is free software: you can redistribute it and/or modify \n" + "OatFloweringModel is free software: you can redistribute it and/or modify \n" +
"it under the terms of the Bioforsk Open Source License as published by \n" + "it under the terms of the NIBIO Open Source License as published by \n" +
"Bioforsk, either version 1 of the License, or (at your option) any \n" + "NIBIO, either version 1 of the License, or (at your option) any \n" +
"later version. \n" + "later version. \n" +
"\n" + "\n" +
"OatFloweringModel is distributed in the hope that it will be useful, \n" + "OatFloweringModel is distributed in the hope that it will be useful, \n" +
"but WITHOUT ANY WARRANTY; without even the implied warranty of \n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of \n" +
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \n" +
"Bioforsk Open Source License for more details. \n" + "NIBIO Open Source License for more details. \n" +
"\n" + "\n" +
"You should have received a copy of the Bioforsk Open Source License \n" + "You should have received a copy of the NIBIO Open Source License \n" +
"along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>. \n"; "along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>. \n";
} }
@Override @Override
public String getCopyright() { public String getCopyright() {
return "(c) 2014 Bioforsk (http://www.bioforsk.no/). Contact: post@bioforsk.no"; return "(c) 2014 NIBIO (http://www.nibio.no/). Contact: post@nibio.no";
} }
@Override @Override
......
# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. # Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
# #
# This file is part of OatFloweringModel. # This file is part of OatFloweringModel.
# OatFloweringModel is free software: you can redistribute it and/or modify # OatFloweringModel is free software: you can redistribute it and/or modify
# it under the terms of the Bioforsk Open Source License as published by # it under the terms of the NIBIO Open Source License as published by
# Bioforsk, either version 1 of the License, or (at your option) any # NIBIO, either version 1 of the License, or (at your option) any
# later version. # later version.
# #
# OatFloweringModel is distributed in the hope that it will be useful, # OatFloweringModel is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# Bioforsk Open Source License for more details. # NIBIO Open Source License for more details.
# #
# You should have received a copy of the Bioforsk Open Source License # You should have received a copy of the NIBIO Open Source License
# along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>. # along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>.
# #
......
# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. # Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
# #
# This file is part of OatFloweringModel. # This file is part of OatFloweringModel.
# OatFloweringModel is free software: you can redistribute it and/or modify # OatFloweringModel is free software: you can redistribute it and/or modify
# it under the terms of the Bioforsk Open Source License as published by # it under the terms of the NIBIO Open Source License as published by
# Bioforsk, either version 1 of the License, or (at your option) any # NIBIO, either version 1 of the License, or (at your option) any
# later version. # later version.
# #
# OatFloweringModel is distributed in the hope that it will be useful, # OatFloweringModel is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# Bioforsk Open Source License for more details. # NIBIO Open Source License for more details.
# #
# You should have received a copy of the Bioforsk Open Source License # You should have received a copy of the NIBIO Open Source License
# along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>. # along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>.
# #
name=Havreblomstringsmodell name=Havreblomstringsmodell
......
/* /*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
* *
* This file is part of OatFloweringModel. * This file is part of OatFloweringModel.
* OatFloweringModel is free software: you can redistribute it and/or modify * OatFloweringModel is free software: you can redistribute it and/or modify
* it under the terms of the Bioforsk Open Source License as published by * it under the terms of the NIBIO Open Source License as published by
* Bioforsk, either version 1 of the License, or (at your option) any * NIBIO, either version 1 of the License, or (at your option) any
* later version. * later version.
* *
* OatFloweringModel is distributed in the hope that it will be useful, * OatFloweringModel is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* Bioforsk Open Source License for more details. * NIBIO Open Source License for more details.
* *
* You should have received a copy of the Bioforsk Open Source License * You should have received a copy of the NIBIO Open Source License
* along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>. * along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>.
* *
*/ */
...@@ -29,12 +29,12 @@ import java.util.ArrayList; ...@@ -29,12 +29,12 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import static junit.framework.Assert.fail; import static junit.framework.Assert.fail;
import no.bioforsk.vips.entity.ModelConfiguration; import no.nibio.vips.entity.ModelConfiguration;
import no.bioforsk.vips.entity.Result; import no.nibio.vips.entity.Result;
import no.bioforsk.vips.entity.WeatherObservation; import no.nibio.vips.entity.WeatherObservation;
import no.bioforsk.vips.model.ConfigValidationException; import no.nibio.vips.model.ConfigValidationException;
import no.bioforsk.vips.model.ModelExcecutionException; import no.nibio.vips.model.ModelExcecutionException;
import no.bioforsk.vips.model.oatfloweringmodel.OatFloweringModel; import no.nibio.vips.model.oatfloweringmodel.OatFloweringModel;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import static org.junit.Assert.*; import static org.junit.Assert.*;
...@@ -44,7 +44,7 @@ import org.junit.Test; ...@@ -44,7 +44,7 @@ import org.junit.Test;
/** /**
* *
* @author Tor-Einar Skog <tor-einar.skog@bioforsk.no> * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/ */
public class OatFloweringModelTest { public class OatFloweringModelTest {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment