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 89122a6bc8a09c8d6478544840f1d5f280f81448..482e994467a4644e0b26cfe5df2482d181008736 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>no.bioforsk.vips</groupId> + <groupId>no.nibio.vips</groupId> <artifactId>GrassDryingModel</artifactId> <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <dependencies> <dependency> - <groupId>no.bioforsk.vips.common</groupId> + <groupId>no.nibio.vips.common</groupId> <artifactId>VIPSCommon</artifactId> <version>1.0-SNAPSHOT</version> <scope>provided</scope> diff --git a/src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java b/src/main/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModel.java similarity index 93% rename from src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java rename to src/main/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModel.java index ace3afba7f6346de334e526154106bfd01533e91..0c1a3311a4d8de5f9450e7cdab0b8fb3ba0fae97 100644 --- a/src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java +++ b/src/main/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModel.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 GrassDryingModel. * GrassDryingModel 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. * * GrassDryingModel 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 GrassDryingModel. If not, see <http://www.bioforsk.no/licenses/>. + * You should have received a copy of the NIBIO Open Source License + * along with GrassDryingModel. If not, see <http://www.nibio.no/licenses/>. * */ -package no.bioforsk.vips.model.grassdryingmodel; +package no.nibio.vips.model.grassdryingmodel; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,22 +28,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TimeZone; -import no.bioforsk.vips.entity.ModelConfiguration; -import no.bioforsk.vips.entity.Result; -import no.bioforsk.vips.entity.ResultImpl; -import no.bioforsk.vips.entity.WeatherObservation; -import no.bioforsk.vips.i18n.I18nImpl; -import no.bioforsk.vips.model.ConfigValidationException; -import no.bioforsk.vips.model.Model; -import no.bioforsk.vips.model.ModelExcecutionException; -import no.bioforsk.vips.model.ModelId; -import no.bioforsk.vips.util.WeatherElements; -import no.bioforsk.vips.util.WeatherObservationListException; -import no.bioforsk.vips.util.WeatherUtil; +import no.nibio.vips.entity.ModelConfiguration; +import no.nibio.vips.entity.Result; +import no.nibio.vips.entity.ResultImpl; +import no.nibio.vips.entity.WeatherObservation; +import no.nibio.vips.i18n.I18nImpl; +import no.nibio.vips.model.ConfigValidationException; +import no.nibio.vips.model.Model; +import no.nibio.vips.model.ModelExcecutionException; +import no.nibio.vips.model.ModelId; +import no.nibio.vips.util.WeatherElements; +import no.nibio.vips.util.WeatherObservationListException; +import no.nibio.vips.util.WeatherUtil; /** - * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a> - * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no> + * @copyright 2014 <a href="http://www.nibio.no/">NIBIO</a> + * @author Tor-Einar Skog <tor-einar.skog@nibio.no> */ public class GrassDryingModel extends I18nImpl implements Model{ @@ -80,7 +80,7 @@ public class GrassDryingModel extends I18nImpl implements Model{ public GrassDryingModel() { // Setting the file name of the resource bundle - super("no.bioforsk.vips.model.grassdryingmodel.texts"); + super("no.nibio.vips.model.grassdryingmodel.texts"); } @@ -141,7 +141,7 @@ public class GrassDryingModel extends I18nImpl implements Model{ @Override public String getCopyright() { - return "(c) 2014 Bioforsk (http://www.bioforsk.no/). Contact: post@bioforsk.no"; + return "(c) 2014 NIBIO (http://www.nibio.no/). Contact: post@nibio.no"; } @Override diff --git a/src/main/resources/no/bioforsk/vips/model/grassdryingmodel/texts.properties b/src/main/resources/no/nibio/vips/model/grassdryingmodel/texts.properties similarity index 51% rename from src/main/resources/no/bioforsk/vips/model/grassdryingmodel/texts.properties rename to src/main/resources/no/nibio/vips/model/grassdryingmodel/texts.properties index 64a808335a61fb9dbe59967e887be07d6d1350f7..7f6cfbc1360756fb2215745f11dd2179792da283 100644 --- a/src/main/resources/no/bioforsk/vips/model/grassdryingmodel/texts.properties +++ b/src/main/resources/no/nibio/vips/model/grassdryingmodel/texts.properties @@ -1,18 +1,18 @@ -# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. +# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of GrassDryingModel. # GrassDryingModel 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. # # GrassDryingModel 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 GrassDryingModel. If not, see <http://www.bioforsk.no/licenses/>. +# You should have received a copy of the NIBIO Open Source License +# along with GrassDryingModel. If not, see <http://www.nibio.no/licenses/>. # description=TODO: Need description diff --git a/src/main/resources/no/bioforsk/vips/model/grassdryingmodel/texts_nb.properties b/src/main/resources/no/nibio/vips/model/grassdryingmodel/texts_nb.properties similarity index 52% rename from src/main/resources/no/bioforsk/vips/model/grassdryingmodel/texts_nb.properties rename to src/main/resources/no/nibio/vips/model/grassdryingmodel/texts_nb.properties index cd82a5b9264105ca88fa61b5f88c26a4214fe3ee..129290a1ab11194ec1c817412f16135259a3c78f 100644 --- a/src/main/resources/no/bioforsk/vips/model/grassdryingmodel/texts_nb.properties +++ b/src/main/resources/no/nibio/vips/model/grassdryingmodel/texts_nb.properties @@ -1,18 +1,18 @@ -# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. +# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of GrassDryingModel. # GrassDryingModel 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. # # GrassDryingModel 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 GrassDryingModel. If not, see <http://www.bioforsk.no/licenses/>. +# You should have received a copy of the NIBIO Open Source License +# along with GrassDryingModel. If not, see <http://www.nibio.no/licenses/>. # description=TODO: Trenger beskrivelse diff --git a/src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java b/src/test/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModelTest.java similarity index 91% rename from src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java rename to src/test/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModelTest.java index 5d58496f705438c9a2949b9c94f2ee00108dfe66..cce4eee02a76cd26d31bdceb397edf81e429131f 100644 --- a/src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java +++ b/src/test/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModelTest.java @@ -1,24 +1,25 @@ /* - * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. + * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of GrassDryingModel. * GrassDryingModel 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. * * GrassDryingModel 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 GrassDryingModel. If not, see <http://www.bioforsk.no/licenses/>. + * You should have received a copy of the NIBIO Open Source License + * along with GrassDryingModel. If not, see <http://www.nibio.no/licenses/>. * */ -package no.bioforsk.vips.model.grassdryingmodel; +package no.nibio.vips.model.grassdryingmodel; +import no.nibio.vips.model.grassdryingmodel.GrassDryingModel; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.type.TypeReference; @@ -35,12 +36,12 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; import static junit.framework.Assert.fail; -import no.bioforsk.vips.entity.ModelConfiguration; -import no.bioforsk.vips.entity.Result; -import no.bioforsk.vips.entity.WeatherObservation; -import no.bioforsk.vips.model.ConfigValidationException; -import no.bioforsk.vips.model.ModelExcecutionException; -import no.bioforsk.vips.util.WeatherElements; +import no.nibio.vips.entity.ModelConfiguration; +import no.nibio.vips.entity.Result; +import no.nibio.vips.entity.WeatherObservation; +import no.nibio.vips.model.ConfigValidationException; +import no.nibio.vips.model.ModelExcecutionException; +import no.nibio.vips.util.WeatherElements; import org.junit.After; import org.junit.AfterClass; import static org.junit.Assert.*; @@ -50,7 +51,7 @@ import org.junit.Test; /** * - * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no> + * @author Tor-Einar Skog <tor-einar.skog@nibio.no> */ public class GrassDryingModelTest {