From 880f521e682da6b91584be8a36dda8e81b9d9414 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Sun, 19 Jul 2015 13:05:20 +0200
Subject: [PATCH] Refactoring everything Bioforsk -> NIBIO
---
LICENSE.txt | 38 +++++++++----------
nb-configuration.xml | 2 +-
pom.xml | 2 +-
.../bioforsk/vips/util/CommonNamespaces.java | 29 --------------
.../util/InvalidAggregationTypeException.java | 31 ---------------
.../util/WeatherObservationListException.java | 32 ----------------
.../vips/core/service/ModelResource.java | 20 +++++-----
.../coremanager/service/ManagerResource.java | 20 +++++-----
.../vips/entity/ModelConfiguration.java | 18 ++++-----
.../vips/entity/ModelRunRequest.java | 18 ++++-----
.../vips/entity/Result.java | 16 ++++----
.../vips/entity/ResultImpl.java | 18 ++++-----
.../vips/entity/Weather.java | 14 +++----
.../vips/entity/WeatherObservation.java | 18 ++++-----
.../vips/i18n/I18nImpl.java | 28 +++++++-------
.../vips/i18n/LanguageUtil.java | 18 ++++-----
.../vips/model/ConfigValidationException.java | 18 ++++-----
.../{bioforsk => nibio}/vips/model/Model.java | 22 +++++------
.../vips/model/ModelExcecutionException.java | 18 ++++-----
.../vips/model/ModelId.java | 18 ++++-----
.../vips/observation/Observation.java | 6 +--
.../vips/observation/ObservationImpl.java | 2 +-
.../vips/pestmanagement/Spraying.java | 6 +--
.../vips/pestmanagement/SprayingImpl.java | 2 +-
.../vips/util/ArrayUtil.java | 18 ++++-----
.../no/nibio/vips/util/CommonNamespaces.java | 29 ++++++++++++++
.../vips/util/DateMap.java | 18 ++++-----
.../vips/util/ExceptionUtil.java | 18 ++++-----
.../util/InvalidAggregationTypeException.java | 31 +++++++++++++++
.../vips/util/JSONUtil.java | 18 ++++-----
.../vips/util/MD5Encrypter.java | 18 ++++-----
.../vips/util/ParseRESTParamUtil.java | 2 +-
.../vips/util/ServletUtil.java | 18 ++++-----
.../vips/util/WeatherElements.java | 18 ++++-----
.../util/WeatherObservationListException.java | 32 ++++++++++++++++
.../vips/util/WeatherUtil.java | 20 +++++-----
.../vips/util/WebUtil.java | 18 ++++-----
.../vips/common/AppTest.java | 14 +++----
.../vips/util/WeatherUtilTest.java | 24 +++++++-----
39 files changed, 357 insertions(+), 353 deletions(-)
delete mode 100644 src/main/java/no/bioforsk/vips/util/CommonNamespaces.java
delete mode 100644 src/main/java/no/bioforsk/vips/util/InvalidAggregationTypeException.java
delete mode 100644 src/main/java/no/bioforsk/vips/util/WeatherObservationListException.java
rename src/main/java/no/{bioforsk => nibio}/vips/core/service/ModelResource.java (90%)
rename src/main/java/no/{bioforsk => nibio}/vips/coremanager/service/ManagerResource.java (90%)
rename src/main/java/no/{bioforsk => nibio}/vips/entity/ModelConfiguration.java (81%)
rename src/main/java/no/{bioforsk => nibio}/vips/entity/ModelRunRequest.java (79%)
rename src/main/java/no/{bioforsk => nibio}/vips/entity/Result.java (76%)
rename src/main/java/no/{bioforsk => nibio}/vips/entity/ResultImpl.java (79%)
rename src/main/java/no/{bioforsk => nibio}/vips/entity/Weather.java (77%)
rename src/main/java/no/{bioforsk => nibio}/vips/entity/WeatherObservation.java (87%)
rename src/main/java/no/{bioforsk => nibio}/vips/i18n/I18nImpl.java (78%)
rename src/main/java/no/{bioforsk => nibio}/vips/i18n/LanguageUtil.java (66%)
rename src/main/java/no/{bioforsk => nibio}/vips/model/ConfigValidationException.java (64%)
rename src/main/java/no/{bioforsk => nibio}/vips/model/Model.java (84%)
rename src/main/java/no/{bioforsk => nibio}/vips/model/ModelExcecutionException.java (62%)
rename src/main/java/no/{bioforsk => nibio}/vips/model/ModelId.java (64%)
rename src/main/java/no/{bioforsk => nibio}/vips/observation/Observation.java (86%)
rename src/main/java/no/{bioforsk => nibio}/vips/observation/ObservationImpl.java (98%)
rename src/main/java/no/{bioforsk => nibio}/vips/pestmanagement/Spraying.java (84%)
rename src/main/java/no/{bioforsk => nibio}/vips/pestmanagement/SprayingImpl.java (98%)
rename src/main/java/no/{bioforsk => nibio}/vips/util/ArrayUtil.java (68%)
create mode 100644 src/main/java/no/nibio/vips/util/CommonNamespaces.java
rename src/main/java/no/{bioforsk => nibio}/vips/util/DateMap.java (95%)
rename src/main/java/no/{bioforsk => nibio}/vips/util/ExceptionUtil.java (57%)
create mode 100644 src/main/java/no/nibio/vips/util/InvalidAggregationTypeException.java
rename src/main/java/no/{bioforsk => nibio}/vips/util/JSONUtil.java (66%)
rename src/main/java/no/{bioforsk => nibio}/vips/util/MD5Encrypter.java (79%)
rename src/main/java/no/{bioforsk => nibio}/vips/util/ParseRESTParamUtil.java (98%)
rename src/main/java/no/{bioforsk => nibio}/vips/util/ServletUtil.java (85%)
rename src/main/java/no/{bioforsk => nibio}/vips/util/WeatherElements.java (78%)
create mode 100644 src/main/java/no/nibio/vips/util/WeatherObservationListException.java
rename src/main/java/no/{bioforsk => nibio}/vips/util/WeatherUtil.java (98%)
rename src/main/java/no/{bioforsk => nibio}/vips/util/WebUtil.java (84%)
rename src/test/java/no/{bioforsk => nibio}/vips/common/AppTest.java (68%)
rename src/test/java/no/{bioforsk => nibio}/vips/util/WeatherUtilTest.java (97%)
diff --git a/LICENSE.txt b/LICENSE.txt
index e5e9323..9556dad 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 33e441e..7103095 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 51c51db..8ea2cc3 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 c3d60bb..0000000
--- 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 980015d..0000000
--- 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 8646aca..0000000
--- 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 a67860d..81e9eef 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 28189da..d0751ca 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 2ea07d7..1a10ef7 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 48b6ec5..7c1678f 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 0a82aad..4e18ec6 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 3eec8c3..17f76f0 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 58504fb..6ab58b5 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 7d5ab10..7a83b74 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 19b439a..62fd4a8 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 c22ddec..56f72d6 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 14ea85f..68ef8a3 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 b963d62..c7da136 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 6d26ea1..62fa5b1 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 793c1e7..bdbd83c 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 3c34fcd..dd2024f 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 9db671f..f2bb0ff 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 a472522..ec585ea 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 5afbab5..8a970b4 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 1fd774b..00775df 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 0000000..5fbe0eb
--- /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 86a0255..d5a2b7a 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 d0fb384..a705f7f 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 0000000..df659d7
--- /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 75cdcda..9ffbf61 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 266dff5..2c97d23 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 7dbcac6..a98a5dc 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 3b1e160..3b401bd 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 6fb4d86..94f3249 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 0000000..a684e2f
--- /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 359a41f..404e233 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 29fed4c..fba3fa8 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 caf7a31..51d913e 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 a1e4bd2..639fae4 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 {
--
GitLab