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 51c51db090da4fe66293d92478c986fdcfe8b2cc..8ea2cc3caffaea1c143de909fc7e734e4a8e405a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
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.common</groupId>
+ <groupId>no.nibio.vips.common</groupId>
<artifactId>VIPSCommon</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java b/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java
deleted file mode 100644
index c3d60bbb50befd827b5f310e097ed801b3f05394..0000000000000000000000000000000000000000
--- a/src/main/java/no/bioforsk/vips/util/CommonNamespaces.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
- *
- * This file is part of VIPSCommon.
- * VIPSCommon 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.
- *
- * 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
- * Bioforsk Open Source License for more details.
- *
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
- *
- */
-
-package no.bioforsk.vips.util;
-
-/**
- * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
- */
-public class CommonNamespaces {
- public final static String NS_WEATHER = "WEATHER";
- public final static String NS_FORECAST = "FORECAST";
-}
diff --git a/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java b/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java
deleted file mode 100644
index 980015d16eb96ef0a1039e0626c261a91a63e2ec..0000000000000000000000000000000000000000
--- a/src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
- *
- * This file is part of VIPSCommon.
- * VIPSCommon 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.
- *
- * 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
- * Bioforsk Open Source License for more details.
- *
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
- *
- */
-
-package no.bioforsk.vips.util;
-
-/**
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
- */
-public class InvalidAggregationTypeException extends Exception {
-
- public InvalidAggregationTypeException(String string) {
- }
-
-}
diff --git a/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java b/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java
deleted file mode 100644
index 8646acae5f2d636b4209646bba25bd70f12a6de5..0000000000000000000000000000000000000000
--- a/src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
- *
- * This file is part of VIPSCommon.
- * VIPSCommon 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.
- *
- * 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
- * Bioforsk Open Source License for more details.
- *
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
- *
- */
-
-package no.bioforsk.vips.util;
-
-/**
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
- */
-public class WeatherObservationListException extends Exception {
-
- public WeatherObservationListException(String msg)
- {
- super(msg);
- }
-}
diff --git a/src/main/java/no/bioforsk/vips/core/service/ModelResource.java b/src/main/java/no/nibio/vips/core/service/ModelResource.java
similarity index 90%
rename from src/main/java/no/bioforsk/vips/core/service/ModelResource.java
rename to src/main/java/no/nibio/vips/core/service/ModelResource.java
index a67860d566a408d336ae006a36528cf117e17f32..81e9eefb8e1f0461f3957508ccf6a4860f8f9fc1 100644
--- a/src/main/java/no/bioforsk/vips/core/service/ModelResource.java
+++ b/src/main/java/no/nibio/vips/core/service/ModelResource.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.core.service;
+package no.nibio.vips.core.service;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
@@ -26,13 +26,13 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
-import no.bioforsk.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.ModelConfiguration;
/**
* Interface for the ModelResource. Implemented by ModelResourceImpl
* in VIPSCore and also as client in VIPSCoreManager
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
@Path("")
public interface ModelResource {
diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java b/src/main/java/no/nibio/vips/coremanager/service/ManagerResource.java
similarity index 90%
rename from src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java
rename to src/main/java/no/nibio/vips/coremanager/service/ManagerResource.java
index 28189da01224964fadabd899cbd1cf7043ba7ccc..d0751ca07e7532768f790fa1b3ef3b37f71cdf4a 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResource.java
+++ b/src/main/java/no/nibio/vips/coremanager/service/ManagerResource.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.coremanager.service;
+package no.nibio.vips.coremanager.service;
import java.util.Map;
import javax.ws.rs.Consumes;
@@ -27,13 +27,13 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
-import no.bioforsk.vips.entity.ModelRunRequest;
+import no.nibio.vips.entity.ModelRunRequest;
/**
* Interface for the ManagerResource. Implemented by ManagerResourceImpl
* in VIPSCoreManager and also as client in VIPSCommon
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public interface ManagerResource {
/**
diff --git a/src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java b/src/main/java/no/nibio/vips/entity/ModelConfiguration.java
similarity index 81%
rename from src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java
rename to src/main/java/no/nibio/vips/entity/ModelConfiguration.java
index 2ea07d712d00df52817c766e7d1c75d58e290f51..1a10ef7cc8a26ca36de4cace864a7801549c6154 100644
--- a/src/main/java/no/bioforsk/vips/entity/ModelConfiguration.java
+++ b/src/main/java/no/nibio/vips/entity/ModelConfiguration.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.entity;
+package no.nibio.vips.entity;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -29,8 +29,8 @@ import java.util.Map;
* To see which configuration needs to be provided for a particular model,
* read the getUsage() from that model.
*
- * @copyright 2013 {@link http://www.bioforsk.no Bioforsk}
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 {@link http://www.nibio.no NIBIO}
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ModelConfiguration {
private String modelId;
diff --git a/src/main/java/no/bioforsk/vips/entity/ModelRunRequest.java b/src/main/java/no/nibio/vips/entity/ModelRunRequest.java
similarity index 79%
rename from src/main/java/no/bioforsk/vips/entity/ModelRunRequest.java
rename to src/main/java/no/nibio/vips/entity/ModelRunRequest.java
index 48b6ec5bd6f5e9aaf3997df02c98382175da2bc5..7c1678f4521326a73403293ca6419614b673a90e 100644
--- a/src/main/java/no/bioforsk/vips/entity/ModelRunRequest.java
+++ b/src/main/java/no/nibio/vips/entity/ModelRunRequest.java
@@ -1,31 +1,31 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.entity;
+package no.nibio.vips.entity;
import java.util.Map;
/**
* Represents the request sent to VIPSCoreManager for running a model
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ModelRunRequest {
private Map<String, Object> configParameters;
diff --git a/src/main/java/no/bioforsk/vips/entity/Result.java b/src/main/java/no/nibio/vips/entity/Result.java
similarity index 76%
rename from src/main/java/no/bioforsk/vips/entity/Result.java
rename to src/main/java/no/nibio/vips/entity/Result.java
index 0a82aad3196c3b96793bc9841214a998f11544f0..4e18ec6ac2da5230a89354682fdb1553d7185856 100644
--- a/src/main/java/no/bioforsk/vips/entity/Result.java
+++ b/src/main/java/no/nibio/vips/entity/Result.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.entity;
+package no.nibio.vips.entity;
import java.util.Date;
import java.util.Map;
@@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
/**
* Represents a result from a model run
- * @copyright 2013 {@link http://www.bioforsk.no Bioforsk}
+ * @copyright 2013 {@link http://www.nibio.no NIBIO}
* @author Tor-Einar Skog <tor-einar.skog@hyper.no>
*/
@JsonDeserialize(as=ResultImpl.class)
diff --git a/src/main/java/no/bioforsk/vips/entity/ResultImpl.java b/src/main/java/no/nibio/vips/entity/ResultImpl.java
similarity index 79%
rename from src/main/java/no/bioforsk/vips/entity/ResultImpl.java
rename to src/main/java/no/nibio/vips/entity/ResultImpl.java
index 3eec8c3f6c11326b20de22a6ce1a2cd5af433440..17f76f0651985efe5881a72601d1a1512286e727 100644
--- a/src/main/java/no/bioforsk/vips/entity/ResultImpl.java
+++ b/src/main/java/no/nibio/vips/entity/ResultImpl.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.entity;
+package no.nibio.vips.entity;
import java.util.Date;
import java.util.HashMap;
@@ -26,8 +26,8 @@ import java.util.Set;
/**
* Represents a result
- * @copyright 2013 <a href="http://www.bioforsk.no">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ResultImpl implements Result{
private Date resultValidTime;
diff --git a/src/main/java/no/bioforsk/vips/entity/Weather.java b/src/main/java/no/nibio/vips/entity/Weather.java
similarity index 77%
rename from src/main/java/no/bioforsk/vips/entity/Weather.java
rename to src/main/java/no/nibio/vips/entity/Weather.java
index 58504fbea79494075ff4120aafa085d474ff429e..6ab58b5c9c6f0bb8b7087121817fd5e17398be5f 100644
--- a/src/main/java/no/bioforsk/vips/entity/Weather.java
+++ b/src/main/java/no/nibio/vips/entity/Weather.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.entity;
+package no.nibio.vips.entity;
import java.util.Date;
import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src/main/java/no/bioforsk/vips/entity/WeatherObservation.java b/src/main/java/no/nibio/vips/entity/WeatherObservation.java
similarity index 87%
rename from src/main/java/no/bioforsk/vips/entity/WeatherObservation.java
rename to src/main/java/no/nibio/vips/entity/WeatherObservation.java
index 7d5ab1035fc919136c708f6e99162bc6c74cc33e..7a83b7485f99c0cb4b20f7d38f7181c099340d29 100644
--- a/src/main/java/no/bioforsk/vips/entity/WeatherObservation.java
+++ b/src/main/java/no/nibio/vips/entity/WeatherObservation.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.entity;
+package no.nibio.vips.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -26,8 +26,8 @@ import java.util.Date;
/**
* Data object that represents a weather observation. Could be measured (historical
* and forecasted (future).
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class WeatherObservation implements Comparable{
diff --git a/src/main/java/no/bioforsk/vips/i18n/I18nImpl.java b/src/main/java/no/nibio/vips/i18n/I18nImpl.java
similarity index 78%
rename from src/main/java/no/bioforsk/vips/i18n/I18nImpl.java
rename to src/main/java/no/nibio/vips/i18n/I18nImpl.java
index 19b439acb3c5754d376791fe54bf9e4895b71372..62fd4a8992427d584530bbc053b95061860cdac7 100644
--- a/src/main/java/no/bioforsk/vips/i18n/I18nImpl.java
+++ b/src/main/java/no/nibio/vips/i18n/I18nImpl.java
@@ -1,42 +1,42 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.i18n;
+package no.nibio.vips.i18n;
import java.util.HashMap;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import no.bioforsk.vips.model.Model;
+import no.nibio.vips.model.Model;
/**
* Utility class to extend for classes that wish to have easy access to.
* Could also be used as a util class (without extending)
* ResourceBundles
- * @copyright 2013 <a href="http://www.bioforsk.no">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class I18nImpl {
/*
* The basename of the properties file. Full package
- * must be provided, e.g. for the files no/bioforsk/vips/somepackage/texts[_lang].properties,
- * please specify "no.bioforsk.vips.somepackage.texts"
+ * must be provided, e.g. for the files no/nibio/vips/somepackage/texts[_lang].properties,
+ * please specify "no.nibio.vips.somepackage.texts"
*/
protected String resourceBundleBaseName;
protected HashMap<String, ResourceBundle> resourceBundles;
@@ -44,8 +44,8 @@ public class I18nImpl {
/**
* When extending this class, use the super(resourceBundleBaseName); in the subclass's constructor
* @param resourceBundleBaseName The basename of the properties file. Full package
- * must be provided, e.g. for the files no/bioforsk/vips/somepackage/texts[_lang].properties,
- * please specify "no.bioforsk.vips.somepackage.texts"
+ * must be provided, e.g. for the files no/nibio/vips/somepackage/texts[_lang].properties,
+ * please specify "no.nibio.vips.somepackage.texts"
*/
public I18nImpl(String resourceBundleBaseName)
{
diff --git a/src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java b/src/main/java/no/nibio/vips/i18n/LanguageUtil.java
similarity index 66%
rename from src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java
rename to src/main/java/no/nibio/vips/i18n/LanguageUtil.java
index c22ddec3b40735ef5cd98cc00d3113baa8b5dbe0..56f72d6538f2b5606623b70535e0f0031bd023cf 100644
--- a/src/main/java/no/bioforsk/vips/i18n/LanguageUtil.java
+++ b/src/main/java/no/nibio/vips/i18n/LanguageUtil.java
@@ -1,31 +1,31 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.i18n;
+package no.nibio.vips.i18n;
import java.util.HashMap;
import java.util.Map;
import com.ibm.icu.util.ULocale;
/**
- * @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 LanguageUtil {
diff --git a/src/main/java/no/bioforsk/vips/model/ConfigValidationException.java b/src/main/java/no/nibio/vips/model/ConfigValidationException.java
similarity index 64%
rename from src/main/java/no/bioforsk/vips/model/ConfigValidationException.java
rename to src/main/java/no/nibio/vips/model/ConfigValidationException.java
index 14ea85f6681cedc347225ec7da902e583811bc8a..68ef8a37d18524a6eac6b5ad4a6ecd6ef7d7b638 100644
--- a/src/main/java/no/bioforsk/vips/model/ConfigValidationException.java
+++ b/src/main/java/no/nibio/vips/model/ConfigValidationException.java
@@ -1,29 +1,29 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.model;
+package no.nibio.vips.model;
/**
* Thrown when the configuration of the model is incorrect,
* i.e. when input data do not meet the criteria of the model
- * @copyright 2013 Bioforsk
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 NIBIO
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ConfigValidationException extends Exception {
diff --git a/src/main/java/no/bioforsk/vips/model/Model.java b/src/main/java/no/nibio/vips/model/Model.java
similarity index 84%
rename from src/main/java/no/bioforsk/vips/model/Model.java
rename to src/main/java/no/nibio/vips/model/Model.java
index b963d626a34d1fb49f134800e6897aacd0e23f09..c7da13680994c5d0c990759f8987a69165fad6f3 100644
--- a/src/main/java/no/bioforsk/vips/model/Model.java
+++ b/src/main/java/no/nibio/vips/model/Model.java
@@ -1,32 +1,32 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.model;
+package no.nibio.vips.model;
-import no.bioforsk.vips.entity.Result;
+import no.nibio.vips.entity.Result;
import java.util.List;
-import no.bioforsk.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.ModelConfiguration;
/**
* All models must implement this interface
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public interface Model {
diff --git a/src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java b/src/main/java/no/nibio/vips/model/ModelExcecutionException.java
similarity index 62%
rename from src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java
rename to src/main/java/no/nibio/vips/model/ModelExcecutionException.java
index 6d26ea12d33ee31bca58b0e710ac130ee2044f66..62fa5b1310980cb4c12524d3488c25f51baa2956 100644
--- a/src/main/java/no/bioforsk/vips/model/ModelExcecutionException.java
+++ b/src/main/java/no/nibio/vips/model/ModelExcecutionException.java
@@ -1,28 +1,28 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.model;
+package no.nibio.vips.model;
/**
* Thrown if the excecution of the model fails
- * @copyright 2013 Bioforsk
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 NIBIO
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ModelExcecutionException extends Exception {
diff --git a/src/main/java/no/bioforsk/vips/model/ModelId.java b/src/main/java/no/nibio/vips/model/ModelId.java
similarity index 64%
rename from src/main/java/no/bioforsk/vips/model/ModelId.java
rename to src/main/java/no/nibio/vips/model/ModelId.java
index 793c1e7a9aa78e5031b0a9eff4550340790d87a2..bdbd83c2709e23478ceef890d2c9bf59d244b1ef 100644
--- a/src/main/java/no/bioforsk/vips/model/ModelId.java
+++ b/src/main/java/no/nibio/vips/model/ModelId.java
@@ -1,28 +1,28 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.model;
+package no.nibio.vips.model;
/**
* Represents a model Id. Must be a 10-character string with alphanumerics and no spaces
- * @copyright 2013 {@link http://www.bioforsk.no Bioforsk}
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 {@link http://www.nibio.no NIBIO}
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ModelId {
private char[] id;
diff --git a/src/main/java/no/bioforsk/vips/observation/Observation.java b/src/main/java/no/nibio/vips/observation/Observation.java
similarity index 86%
rename from src/main/java/no/bioforsk/vips/observation/Observation.java
rename to src/main/java/no/nibio/vips/observation/Observation.java
index 3c34fcdfb581979e716d784a8eebb7e61c86db54..dd2024f1abb51e9f2b69ad8b11b1e808d5a7e38a 100644
--- a/src/main/java/no/bioforsk/vips/observation/Observation.java
+++ b/src/main/java/no/nibio/vips/observation/Observation.java
@@ -17,13 +17,13 @@
*
*/
-package no.bioforsk.vips.observation;
+package no.nibio.vips.observation;
import java.util.Date;
/**
- * @copyright 2015 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2015 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public interface Observation {
diff --git a/src/main/java/no/bioforsk/vips/observation/ObservationImpl.java b/src/main/java/no/nibio/vips/observation/ObservationImpl.java
similarity index 98%
rename from src/main/java/no/bioforsk/vips/observation/ObservationImpl.java
rename to src/main/java/no/nibio/vips/observation/ObservationImpl.java
index 9db671f0887279055472230413b72579ae20e96d..f2bb0ff9728284f9c7a7625b972cc132ab395020 100644
--- a/src/main/java/no/bioforsk/vips/observation/ObservationImpl.java
+++ b/src/main/java/no/nibio/vips/observation/ObservationImpl.java
@@ -17,7 +17,7 @@
*
*/
-package no.bioforsk.vips.observation;
+package no.nibio.vips.observation;
import java.util.Date;
diff --git a/src/main/java/no/bioforsk/vips/pestmanagement/Spraying.java b/src/main/java/no/nibio/vips/pestmanagement/Spraying.java
similarity index 84%
rename from src/main/java/no/bioforsk/vips/pestmanagement/Spraying.java
rename to src/main/java/no/nibio/vips/pestmanagement/Spraying.java
index a4725220c68129486f97533dbc3622fa81146fc9..ec585ea0217381cb211cf92e76f20056f526b15a 100644
--- a/src/main/java/no/bioforsk/vips/pestmanagement/Spraying.java
+++ b/src/main/java/no/nibio/vips/pestmanagement/Spraying.java
@@ -17,13 +17,13 @@
*
*/
-package no.bioforsk.vips.pestmanagement;
+package no.nibio.vips.pestmanagement;
import java.util.Date;
/**
- * @copyright 2015 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2015 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public interface Spraying {
public Date getSprayingDate();
diff --git a/src/main/java/no/bioforsk/vips/pestmanagement/SprayingImpl.java b/src/main/java/no/nibio/vips/pestmanagement/SprayingImpl.java
similarity index 98%
rename from src/main/java/no/bioforsk/vips/pestmanagement/SprayingImpl.java
rename to src/main/java/no/nibio/vips/pestmanagement/SprayingImpl.java
index 5afbab5f3a4232229d672f70d56557548506672d..8a970b43a505d12f16fd2b283f9700fce0f5dfec 100644
--- a/src/main/java/no/bioforsk/vips/pestmanagement/SprayingImpl.java
+++ b/src/main/java/no/nibio/vips/pestmanagement/SprayingImpl.java
@@ -17,7 +17,7 @@
*
*/
-package no.bioforsk.vips.pestmanagement;
+package no.nibio.vips.pestmanagement;
import java.util.Date;
diff --git a/src/main/java/no/bioforsk/vips/util/ArrayUtil.java b/src/main/java/no/nibio/vips/util/ArrayUtil.java
similarity index 68%
rename from src/main/java/no/bioforsk/vips/util/ArrayUtil.java
rename to src/main/java/no/nibio/vips/util/ArrayUtil.java
index 1fd774b749a77d0f4b4190a8d40cbe358cb233ff..00775dffa4fc10d09334cf7552cace7786b79cef 100644
--- a/src/main/java/no/bioforsk/vips/util/ArrayUtil.java
+++ b/src/main/java/no/nibio/vips/util/ArrayUtil.java
@@ -1,27 +1,27 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
/**
- * @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 ArrayUtil {
diff --git a/src/main/java/no/nibio/vips/util/CommonNamespaces.java b/src/main/java/no/nibio/vips/util/CommonNamespaces.java
new file mode 100644
index 0000000000000000000000000000000000000000..5fbe0eb2b20aaafcc9c82dda4551ede9a464fdfb
--- /dev/null
+++ b/src/main/java/no/nibio/vips/util/CommonNamespaces.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
+ *
+ * This file is part of VIPSCommon.
+ * VIPSCommon is free software: you can redistribute it and/or modify
+ * 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.
+ *
+ * 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
+ * NIBIO Open Source License for more details.
+ *
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
+ *
+ */
+
+package no.nibio.vips.util;
+
+/**
+ * @copyright 2014 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
+ */
+public class CommonNamespaces {
+ public final static String NS_WEATHER = "WEATHER";
+ public final static String NS_FORECAST = "FORECAST";
+}
diff --git a/src/main/java/no/bioforsk/vips/util/DateMap.java b/src/main/java/no/nibio/vips/util/DateMap.java
similarity index 95%
rename from src/main/java/no/bioforsk/vips/util/DateMap.java
rename to src/main/java/no/nibio/vips/util/DateMap.java
index 86a02556e150b79089072b13f9870935deb257ef..d5a2b7ae660342d61fe2168e3bbec810cb37bb22 100644
--- a/src/main/java/no/bioforsk/vips/util/DateMap.java
+++ b/src/main/java/no/nibio/vips/util/DateMap.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
import java.text.DateFormat;
import java.text.DecimalFormat;
@@ -36,8 +36,8 @@ import java.util.TimeZone;
/**
* Multiple parameters mapped by Date
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class DateMap {
diff --git a/src/main/java/no/bioforsk/vips/util/ExceptionUtil.java b/src/main/java/no/nibio/vips/util/ExceptionUtil.java
similarity index 57%
rename from src/main/java/no/bioforsk/vips/util/ExceptionUtil.java
rename to src/main/java/no/nibio/vips/util/ExceptionUtil.java
index d0fb384ddbc59a713759fb5824cf666795dab495..a705f7f81d56dbe459f44f71b3defbd73fdd7f24 100644
--- a/src/main/java/no/bioforsk/vips/util/ExceptionUtil.java
+++ b/src/main/java/no/nibio/vips/util/ExceptionUtil.java
@@ -1,27 +1,27 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
/**
- * @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 ExceptionUtil {
diff --git a/src/main/java/no/nibio/vips/util/InvalidAggregationTypeException.java b/src/main/java/no/nibio/vips/util/InvalidAggregationTypeException.java
new file mode 100644
index 0000000000000000000000000000000000000000..df659d7f150763bf786557c9231e6c3c5154c823
--- /dev/null
+++ b/src/main/java/no/nibio/vips/util/InvalidAggregationTypeException.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
+ *
+ * This file is part of VIPSCommon.
+ * VIPSCommon is free software: you can redistribute it and/or modify
+ * 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.
+ *
+ * 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
+ * NIBIO Open Source License for more details.
+ *
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
+ *
+ */
+
+package no.nibio.vips.util;
+
+/**
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
+ */
+public class InvalidAggregationTypeException extends Exception {
+
+ public InvalidAggregationTypeException(String string) {
+ }
+
+}
diff --git a/src/main/java/no/bioforsk/vips/util/JSONUtil.java b/src/main/java/no/nibio/vips/util/JSONUtil.java
similarity index 66%
rename from src/main/java/no/bioforsk/vips/util/JSONUtil.java
rename to src/main/java/no/nibio/vips/util/JSONUtil.java
index 75cdcda879b59934b7b3f6509200fbd8efdc0078..9ffbf611e9f6567d9b920ec32363af9a5463b8d0 100644
--- a/src/main/java/no/bioforsk/vips/util/JSONUtil.java
+++ b/src/main/java/no/nibio/vips/util/JSONUtil.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
@@ -26,8 +26,8 @@ import java.io.IOException;
/**
* Simple utility class for JSON, building on top of Jackson
- * @copyright 2013-2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013-2014 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class JSONUtil {
public static boolean isValidJSON(final String json) {
diff --git a/src/main/java/no/bioforsk/vips/util/MD5Encrypter.java b/src/main/java/no/nibio/vips/util/MD5Encrypter.java
similarity index 79%
rename from src/main/java/no/bioforsk/vips/util/MD5Encrypter.java
rename to src/main/java/no/nibio/vips/util/MD5Encrypter.java
index 266dff5ceb9cfadb2a960dff4f689ff751e2ced6..2c97d23ddbce83e3fe1e879713e7dc518771ee6c 100644
--- a/src/main/java/no/bioforsk/vips/util/MD5Encrypter.java
+++ b/src/main/java/no/nibio/vips/util/MD5Encrypter.java
@@ -1,30 +1,30 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
/**
- * @copyright 2013 Bioforsk.no
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 NIBIO.no
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class MD5Encrypter {
diff --git a/src/main/java/no/bioforsk/vips/util/ParseRESTParamUtil.java b/src/main/java/no/nibio/vips/util/ParseRESTParamUtil.java
similarity index 98%
rename from src/main/java/no/bioforsk/vips/util/ParseRESTParamUtil.java
rename to src/main/java/no/nibio/vips/util/ParseRESTParamUtil.java
index 7dbcac64620b00fea1b1f4a413d40b0ffc0b58ba..a98a5dcc8bb4ddf6b59dc9fccffb045c4857e77f 100644
--- a/src/main/java/no/bioforsk/vips/util/ParseRESTParamUtil.java
+++ b/src/main/java/no/nibio/vips/util/ParseRESTParamUtil.java
@@ -17,7 +17,7 @@
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
import java.text.DateFormat;
import java.text.ParseException;
diff --git a/src/main/java/no/bioforsk/vips/util/ServletUtil.java b/src/main/java/no/nibio/vips/util/ServletUtil.java
similarity index 85%
rename from src/main/java/no/bioforsk/vips/util/ServletUtil.java
rename to src/main/java/no/nibio/vips/util/ServletUtil.java
index 3b1e160c2fd0ba59433e587b6bca0c2887cefa0b..3b401bd6df5ec7882869bf24cd98f1c29a733847 100644
--- a/src/main/java/no/bioforsk/vips/util/ServletUtil.java
+++ b/src/main/java/no/nibio/vips/util/ServletUtil.java
@@ -1,30 +1,30 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
import java.util.Enumeration;
import javax.servlet.http.HttpServletRequest;
/**
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ServletUtil {
/**
diff --git a/src/main/java/no/bioforsk/vips/util/WeatherElements.java b/src/main/java/no/nibio/vips/util/WeatherElements.java
similarity index 78%
rename from src/main/java/no/bioforsk/vips/util/WeatherElements.java
rename to src/main/java/no/nibio/vips/util/WeatherElements.java
index 6fb4d86d50a2cd0bb38e0660f2aa3557a13ecd94..94f32495c1fd8b0b58b8d5a42857c1fa616346e5 100644
--- a/src/main/java/no/bioforsk/vips/util/WeatherElements.java
+++ b/src/main/java/no/nibio/vips/util/WeatherElements.java
@@ -1,28 +1,28 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
/**
* (Probably) temporary definitions of weather elements
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class WeatherElements {
diff --git a/src/main/java/no/nibio/vips/util/WeatherObservationListException.java b/src/main/java/no/nibio/vips/util/WeatherObservationListException.java
new file mode 100644
index 0000000000000000000000000000000000000000..a684e2f17070d2bb6491934d7e03c13b03060110
--- /dev/null
+++ b/src/main/java/no/nibio/vips/util/WeatherObservationListException.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
+ *
+ * This file is part of VIPSCommon.
+ * VIPSCommon is free software: you can redistribute it and/or modify
+ * 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.
+ *
+ * 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
+ * NIBIO Open Source License for more details.
+ *
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
+ *
+ */
+
+package no.nibio.vips.util;
+
+/**
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
+ */
+public class WeatherObservationListException extends Exception {
+
+ public WeatherObservationListException(String msg)
+ {
+ super(msg);
+ }
+}
diff --git a/src/main/java/no/bioforsk/vips/util/WeatherUtil.java b/src/main/java/no/nibio/vips/util/WeatherUtil.java
similarity index 98%
rename from src/main/java/no/bioforsk/vips/util/WeatherUtil.java
rename to src/main/java/no/nibio/vips/util/WeatherUtil.java
index 359a41fcffb9936cd62e76689814071dc12ff246..404e2336d06124aff083b13f9afde2bcfeb2096a 100644
--- a/src/main/java/no/bioforsk/vips/util/WeatherUtil.java
+++ b/src/main/java/no/nibio/vips/util/WeatherUtil.java
@@ -1,23 +1,23 @@
/*
- * Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2015 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -31,12 +31,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
-import no.bioforsk.vips.entity.WeatherObservation;
-import no.bioforsk.vips.model.ConfigValidationException;
+import no.nibio.vips.entity.WeatherObservation;
+import no.nibio.vips.model.ConfigValidationException;
/**
* Weather related utility methods
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class WeatherUtil {
diff --git a/src/main/java/no/bioforsk/vips/util/WebUtil.java b/src/main/java/no/nibio/vips/util/WebUtil.java
similarity index 84%
rename from src/main/java/no/bioforsk/vips/util/WebUtil.java
rename to src/main/java/no/nibio/vips/util/WebUtil.java
index 29fed4ca861a69b9ff328a178c91dfd3ef753a6e..fba3fa87b21c674a14c3a1d880133544f175ceec 100644
--- a/src/main/java/no/bioforsk/vips/util/WebUtil.java
+++ b/src/main/java/no/nibio/vips/util/WebUtil.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
@@ -27,8 +27,8 @@ import org.apache.commons.validator.UrlValidator;
* Static convenience methods for common web-related tasks.
* Based on code found here: http://www.javapractices.com/topic/TopicAction.do?Id=180
*
- * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*
*/
public final class WebUtil {
diff --git a/src/test/java/no/bioforsk/vips/common/AppTest.java b/src/test/java/no/nibio/vips/common/AppTest.java
similarity index 68%
rename from src/test/java/no/bioforsk/vips/common/AppTest.java
rename to src/test/java/no/nibio/vips/common/AppTest.java
index caf7a313e1f6d1d0505d15743d9de6fc5dc35c0a..51d913e9936f7bc81c6901515f81a0b3263f8bff 100644
--- a/src/test/java/no/bioforsk/vips/common/AppTest.java
+++ b/src/test/java/no/nibio/vips/common/AppTest.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 VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.common;
+package no.nibio.vips.common;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java b/src/test/java/no/nibio/vips/util/WeatherUtilTest.java
similarity index 97%
rename from src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java
rename to src/test/java/no/nibio/vips/util/WeatherUtilTest.java
index a1e4bd2a056cba0037eb5f69ab57505bfa75a14e..639fae418d9813016b0e039332c625bd82bdbe2b 100644
--- a/src/test/java/no/bioforsk/vips/util/WeatherUtilTest.java
+++ b/src/test/java/no/nibio/vips/util/WeatherUtilTest.java
@@ -1,24 +1,28 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSCommon.
* VIPSCommon 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.
*
* 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
- * 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 VIPSCommon. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCommon. If not, see <http://www.nibio.no/licenses/>.
*
*/
-package no.bioforsk.vips.util;
+package no.nibio.vips.util;
+import no.nibio.vips.util.WeatherElements;
+import no.nibio.vips.util.WeatherObservationListException;
+import no.nibio.vips.util.InvalidAggregationTypeException;
+import no.nibio.vips.util.WeatherUtil;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -41,12 +45,12 @@ import java.util.logging.Logger;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.fail;
import junit.framework.TestCase;
-import no.bioforsk.vips.entity.WeatherObservation;
-import no.bioforsk.vips.model.ConfigValidationException;
+import no.nibio.vips.entity.WeatherObservation;
+import no.nibio.vips.model.ConfigValidationException;
/**
*
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class WeatherUtilTest extends TestCase {