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

Refactoring everything Bioforsk -> NIBIO

parent 12a56aa9
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 53 additions and 52 deletions
nb-configuration.xml
+ 1
− 1
View file @ f86d25d3
......@@ -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>
pom.xml
+ 2
− 2
View file @ f86d25d3
<?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>
......
src/main/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModel.java → src/main/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModel.java
+ 23
− 23
View file @ f86d25d3
/*
* 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
......
src/main/resources/no/bioforsk/vips/model/grassdryingmodel/texts.properties → src/main/resources/no/nibio/vips/model/grassdryingmodel/texts.properties
+ 6
− 6
View file @ f86d25d3
# 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
......
src/main/resources/no/bioforsk/vips/model/grassdryingmodel/texts_nb.properties → src/main/resources/no/nibio/vips/model/grassdryingmodel/texts_nb.properties
+ 6
− 6
View file @ f86d25d3
# 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
......
src/test/java/no/bioforsk/vips/model/grassdryingmodel/GrassDryingModelTest.java → src/test/java/no/nibio/vips/model/grassdryingmodel/GrassDryingModelTest.java
+ 15
− 14
View file @ f86d25d3
/*
* 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 {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment