diff --git a/LICENSE.txt b/LICENSE.txt
index e5e93233ad450233f8ec1bf0318034b675ad4865..9556dadf4fa51122fa3a0b59f8eeb78151da72de 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,13 +1,13 @@
- BIOFORSK OPEN SOURCE LICENSE V.1.0 (2014)
+ NIBIO OPEN SOURCE LICENSE V.1.0 (2014)
PREAMBLE AND ADDITIONAL TERMS
The original licensor is the Norwegian Institute for Agricultural and
Environmental Research, registered in Norway with registration number 988 983
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.
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
@@ -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
License" definition changed), 13 ("version 3 of the GNU General Public License"
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.
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
-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
-implementation to be used by the BIOFORSK VIPS Platform. You are free to
-implement any other forecasting model to be used by the BIOFORSK VIPS Platform,
+implementation to be used by the NIBIO VIPS Platform. You are free to
+implement any other forecasting model to be used by the NIBIO VIPS Platform,
regardless of license terms at your own responsibility.
(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
-BIOFORSK shall be solved by the exclusive venue of Oslo City Courts, Norway.
+party purports or sets forward any claim towards NIBIO. Any claims towards
+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 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
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
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.
<application name> 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.
+ 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
- <http://www.bioforsk.no/licenses/>.
+ <http://www.nibio.no/licenses/>.
It is also recommended that you add information on how to contact you by
electronic and paper mail.
@@ -63,7 +63,7 @@ this license set forward by yourself or any party deviating its rights from you.
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
works, such as semiconductor masks.
@@ -562,7 +562,7 @@ but the work with which it is combined will remain governed by version
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
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
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
-BIOFORSK. If the Program does not specify a version number of the License, you
-may choose any version ever published by the BIOFORSK.
+NIBIO. If the Program does not specify a version number of the License, you
+may choose any version ever published by the NIBIO.
If the Program specifies that a proxy can decide which future
versions of the License can be used, that proxy's public statement of
diff --git a/nb-configuration.xml b/nb-configuration.xml
index 33e441e8278864cc0db17e7c047d6f8753813a93..7103095542c1a062dedf6d7f32faa28c80b6c0de 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -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).
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>
</project-shared-configuration>
diff --git a/pom.xml b/pom.xml
index 6bd53e3efb4a6beaca5b1d1ca49d8131b7ad64d5..bb34572b40729236ff6c5971cdc6fab17b4851ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
<?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">
<modelVersion>4.0.0</modelVersion>
- <groupId>no.bioforsk.vips.model</groupId>
+ <groupId>no.nibio.vips.model</groupId>
<artifactId>OatFloweringModel</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>no.bioforsk.vips.common</groupId>
+ <groupId>no.nibio.vips.common</groupId>
<artifactId>VIPSCommon</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>provided</scope>
diff --git a/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java b/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
similarity index 82%
rename from src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java
rename to src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
index c54ea3dc155738321a59a96f680f80a4ac36ec19..ccf3c37b4e3742affb9944db3632d41168a135ce 100644
--- a/src/main/java/no/bioforsk/vips/model/oatfloweringmodel/OatFloweringModel.java
+++ b/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
@@ -1,23 +1,23 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of OatFloweringModel.
* OatFloweringModel 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
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* OatFloweringModel 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.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * 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;
@@ -28,22 +28,22 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
-import no.bioforsk.vips.entity.ModelConfiguration;
-import no.bioforsk.vips.entity.Result;
-import no.bioforsk.vips.entity.ResultImpl;
-import no.bioforsk.vips.entity.WeatherObservation;
-import no.bioforsk.vips.i18n.I18nImpl;
-import no.bioforsk.vips.model.ConfigValidationException;
-import no.bioforsk.vips.model.Model;
-import no.bioforsk.vips.model.ModelExcecutionException;
-import no.bioforsk.vips.model.ModelId;
-import no.bioforsk.vips.util.WeatherElements;
-import no.bioforsk.vips.util.WeatherUtil;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.Result;
+import no.nibio.vips.entity.ResultImpl;
+import no.nibio.vips.entity.WeatherObservation;
+import no.nibio.vips.i18n.I18nImpl;
+import no.nibio.vips.model.ConfigValidationException;
+import no.nibio.vips.model.Model;
+import no.nibio.vips.model.ModelExcecutionException;
+import no.nibio.vips.model.ModelId;
+import no.nibio.vips.util.WeatherElements;
+import no.nibio.vips.util.WeatherUtil;
/**
- * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2014 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class OatFloweringModel extends I18nImpl implements Model{
@@ -55,7 +55,7 @@ public class OatFloweringModel extends I18nImpl implements Model{
public OatFloweringModel() {
// Setting the file name of the resource bundle
- super("no.bioforsk.vips.model.oatfloweringmodel.texts");
+ super("no.nibio.vips.model.oatfloweringmodel.texts");
}
@Override
@@ -131,26 +131,26 @@ public class OatFloweringModel extends I18nImpl implements Model{
@Override
public String getLicense() {
- return "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. \n" +
+ return "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. \n" +
"\n" +
"This file is part of OatFloweringModel. \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" +
- "Bioforsk, either version 1 of the License, or (at your option) any \n" +
+ "it under the terms of the NIBIO Open Source License as published by \n" +
+ "NIBIO, either version 1 of the License, or (at your option) any \n" +
"later version. \n" +
"\n" +
"OatFloweringModel is distributed in the hope that it will be useful, \n" +
"but WITHOUT ANY WARRANTY; without even the implied warranty of \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" +
- "You should have received a copy of the Bioforsk Open Source License \n" +
- "along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>. \n";
+ "You should have received a copy of the NIBIO Open Source License \n" +
+ "along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>. \n";
}
@Override
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
diff --git a/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts.properties b/src/main/resources/no/nibio/vips/model/oatfloweringmodel/texts.properties
similarity index 50%
rename from src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts.properties
rename to src/main/resources/no/nibio/vips/model/oatfloweringmodel/texts.properties
index 1626944fd8799a47afefe3742b0ee178f2bc3b67..b943f53cda9125ab4f71b601575812ca26642657 100644
--- a/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts.properties
+++ b/src/main/resources/no/nibio/vips/model/oatfloweringmodel/texts.properties
@@ -1,18 +1,18 @@
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of OatFloweringModel.
# OatFloweringModel 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
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# OatFloweringModel 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.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>.
#
diff --git a/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts_nb.properties b/src/main/resources/no/nibio/vips/model/oatfloweringmodel/texts_nb.properties
similarity index 50%
rename from src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts_nb.properties
rename to src/main/resources/no/nibio/vips/model/oatfloweringmodel/texts_nb.properties
index 3476e4ad51bfe3292538131b940a9c5290995c69..ad17cd99447ebe0ac77cbb170e80b6aa32e33db5 100644
--- a/src/main/resources/no/bioforsk/vips/model/oatfloweringmodel/texts_nb.properties
+++ b/src/main/resources/no/nibio/vips/model/oatfloweringmodel/texts_nb.properties
@@ -1,18 +1,18 @@
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of OatFloweringModel.
# OatFloweringModel 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
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# OatFloweringModel 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.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>.
#
name=Havreblomstringsmodell
diff --git a/src/test/java/OatFloweringModelTest.java b/src/test/java/OatFloweringModelTest.java
index 67d50620e49ac7e7c45253e1bc7bd09ae43044d5..1d54841bb47872429165cf07fd75879fa93ecfbc 100644
--- a/src/test/java/OatFloweringModelTest.java
+++ b/src/test/java/OatFloweringModelTest.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of OatFloweringModel.
* OatFloweringModel 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
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* OatFloweringModel 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.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with OatFloweringModel. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with OatFloweringModel. If not, see <http://www.nibio.no/licenses/>.
*
*/
@@ -29,12 +29,12 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import static junit.framework.Assert.fail;
-import no.bioforsk.vips.entity.ModelConfiguration;
-import no.bioforsk.vips.entity.Result;
-import no.bioforsk.vips.entity.WeatherObservation;
-import no.bioforsk.vips.model.ConfigValidationException;
-import no.bioforsk.vips.model.ModelExcecutionException;
-import no.bioforsk.vips.model.oatfloweringmodel.OatFloweringModel;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.Result;
+import no.nibio.vips.entity.WeatherObservation;
+import no.nibio.vips.model.ConfigValidationException;
+import no.nibio.vips.model.ModelExcecutionException;
+import no.nibio.vips.model.oatfloweringmodel.OatFloweringModel;
import org.junit.After;
import org.junit.AfterClass;
import static org.junit.Assert.*;
@@ -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 {