From 5059da09d970ac23e6aba7b0a628029859bb7072 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Sun, 19 Jul 2015 13:05:49 +0200
Subject: [PATCH] Refactoring everything Bioforsk -> NIBIO

---
 LICENSE.txt                                   | 38 ++++++++---------
 nb-configuration.xml                          |  2 +-
 pom.xml                                       |  4 +-
 .../VIPSCoreManagerApplication.java           | 28 ++++++-------
 .../coremanager/entity/ModelUsageLog.java     | 20 ++++-----
 .../vips/coremanager/entity/Organization.java | 20 ++++-----
 .../entity/VIPSCoreCredentials.java           | 20 ++++-----
 .../vips/coremanager/entity/VipsCoreUser.java | 20 ++++-----
 .../service/JsonParseExceptionMapper.java     | 18 ++++----
 .../service/ManagerResourceImpl.java          | 41 ++++++++++---------
 .../coremanager/session/ControllerGetter.java | 18 ++++----
 .../coremanager/session/UserController.java   | 30 +++++++-------
 src/main/resources/META-INF/persistence.xml   | 12 +++---
 src/main/resources/server.properties          | 12 +++---
 src/main/webapp/WEB-INF/beans.xml             | 12 +++---
 .../WEB-INF/jboss-deployment-structure.xml    | 14 +++----
 src/main/webapp/WEB-INF/jboss-web.xml         | 12 +++---
 .../webapp/WEB-INF/staticcss/stylesheet.css   | 12 +++---
 src/main/webapp/WEB-INF/statichtml/index.html | 12 +++---
 src/main/webapp/WEB-INF/web.xml               | 12 +++---
 20 files changed, 179 insertions(+), 178 deletions(-)
 rename src/main/java/no/{bioforsk => nibio}/vips/coremanager/VIPSCoreManagerApplication.java (58%)
 rename src/main/java/no/{bioforsk => nibio}/vips/coremanager/entity/ModelUsageLog.java (88%)
 rename src/main/java/no/{bioforsk => nibio}/vips/coremanager/entity/Organization.java (85%)
 rename src/main/java/no/{bioforsk => nibio}/vips/coremanager/entity/VIPSCoreCredentials.java (83%)
 rename src/main/java/no/{bioforsk => nibio}/vips/coremanager/entity/VipsCoreUser.java (84%)
 rename src/main/java/no/{bioforsk => nibio}/vips/coremanager/service/JsonParseExceptionMapper.java (63%)
 rename src/main/java/no/{bioforsk => nibio}/vips/coremanager/service/ManagerResourceImpl.java (92%)
 rename src/main/java/no/{bioforsk => nibio}/vips/coremanager/session/ControllerGetter.java (68%)
 rename src/main/java/no/{bioforsk => nibio}/vips/coremanager/session/UserController.java (75%)

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 be09b10..084c449 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -15,6 +15,6 @@ Any value defined here will override the pom.xml file value but is only applicab
 -->
         <netbeans.hint.j2eeVersion>1.5</netbeans.hint.j2eeVersion>
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
-        <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 bb34d10..de7c44c 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.model.</groupId>
+  <groupId>no.nibio.vips.model.</groupId>
   <artifactId>VIPSCoreManager</artifactId>
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
@@ -42,7 +42,7 @@
       <scope>provided</scope>
     </dependency>
      <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/coremanager/VIPSCoreManagerApplication.java b/src/main/java/no/nibio/vips/coremanager/VIPSCoreManagerApplication.java
similarity index 58%
rename from src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java
rename to src/main/java/no/nibio/vips/coremanager/VIPSCoreManagerApplication.java
index 80bcd65..734674e 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java
+++ b/src/main/java/no/nibio/vips/coremanager/VIPSCoreManagerApplication.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 VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
-package no.bioforsk.vips.coremanager;
+package no.nibio.vips.coremanager;
 
 import java.util.Set;
 import javax.ws.rs.ApplicationPath;
@@ -25,8 +25,8 @@ import javax.ws.rs.core.Application;
 
 /**
  * Responsible for adding REST resources
- * @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>
  */
 @ApplicationPath("/")
 public class VIPSCoreManagerApplication extends Application
@@ -45,9 +45,9 @@ public class VIPSCoreManagerApplication extends Application
      * @param resources 
      */
     private void addRestResourceClassesManually(Set<Class<?>> resources) {
-        //resources.add(no.bioforsk.vips.core.service.ModelResource.class);
-        resources.add(no.bioforsk.vips.coremanager.service.ManagerResourceImpl.class);
-        resources.add(no.bioforsk.vips.coremanager.service.JsonParseExceptionMapper.class);
+        //resources.add(no.nibio.vips.core.service.ModelResource.class);
+        resources.add(no.nibio.vips.coremanager.service.ManagerResourceImpl.class);
+        resources.add(no.nibio.vips.coremanager.service.JsonParseExceptionMapper.class);
     }
     
     /**
@@ -56,7 +56,7 @@ public class VIPSCoreManagerApplication extends Application
      * given list with all resources defined in the project.
      */
     private void addRestResourceClasses(Set<Class<?>> resources) {
-        resources.add(no.bioforsk.vips.coremanager.service.JsonParseExceptionMapper.class);
-        resources.add(no.bioforsk.vips.coremanager.service.ManagerResourceImpl.class);
+        resources.add(no.nibio.vips.coremanager.service.JsonParseExceptionMapper.class);
+        resources.add(no.nibio.vips.coremanager.service.ManagerResourceImpl.class);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java b/src/main/java/no/nibio/vips/coremanager/entity/ModelUsageLog.java
similarity index 88%
rename from src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java
rename to src/main/java/no/nibio/vips/coremanager/entity/ModelUsageLog.java
index a7947b9..7d1b5dd 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java
+++ b/src/main/java/no/nibio/vips/coremanager/entity/ModelUsageLog.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 VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
-package no.bioforsk.vips.coremanager.entity;
+package no.nibio.vips.coremanager.entity;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -38,8 +38,8 @@ import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
- * @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>
  */
 @Entity
 @Table(name = "model_usage_log")
@@ -146,7 +146,7 @@ public class ModelUsageLog implements Serializable {
 
     @Override
     public String toString() {
-        return "no.bioforsk.vips.coremanager.entity.ModelUsageLog[ modelUsageId=" + modelUsageId + " ]";
+        return "no.nibio.vips.coremanager.entity.ModelUsageLog[ modelUsageId=" + modelUsageId + " ]";
     }
 
     /**
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java b/src/main/java/no/nibio/vips/coremanager/entity/Organization.java
similarity index 85%
rename from src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
rename to src/main/java/no/nibio/vips/coremanager/entity/Organization.java
index 133321b..7ca28cc 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
+++ b/src/main/java/no/nibio/vips/coremanager/entity/Organization.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 VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
-package no.bioforsk.vips.coremanager.entity;
+package no.nibio.vips.coremanager.entity;
 
 import java.io.Serializable;
 import java.util.Set;
@@ -37,8 +37,8 @@ import javax.xml.bind.annotation.XmlTransient;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
- * @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>
  */
 @Entity
 @Table(name = "organization")
@@ -126,7 +126,7 @@ public class Organization implements Serializable {
 
     @Override
     public String toString() {
-        return "no.bioforsk.vips.coremanager.entity.Organization[ organizationId=" + organizationId + " ]";
+        return "no.nibio.vips.coremanager.entity.Organization[ organizationId=" + organizationId + " ]";
     }
 
 }
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java b/src/main/java/no/nibio/vips/coremanager/entity/VIPSCoreCredentials.java
similarity index 83%
rename from src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java
rename to src/main/java/no/nibio/vips/coremanager/entity/VIPSCoreCredentials.java
index 5fb3080..6806b2b 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java
+++ b/src/main/java/no/nibio/vips/coremanager/entity/VIPSCoreCredentials.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 VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
-package no.bioforsk.vips.coremanager.entity;
+package no.nibio.vips.coremanager.entity;
 
 import java.io.Serializable;
 import javax.persistence.Basic;
@@ -36,8 +36,8 @@ import javax.validation.constraints.Size;
 /**
  * Represents a combination of user name and password to have
  * access to 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>
  */
 @Entity
 @Table(name = "vips_core_credentials")
@@ -90,7 +90,7 @@ public class VIPSCoreCredentials implements Serializable {
 
     @Override
     public String toString() {
-        return "no.bioforsk.vips.coremanager.entity.VIPSCoreCredentials[ id=" + id + " ]";
+        return "no.nibio.vips.coremanager.entity.VIPSCoreCredentials[ id=" + id + " ]";
     }
 
     /**
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java b/src/main/java/no/nibio/vips/coremanager/entity/VipsCoreUser.java
similarity index 84%
rename from src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java
rename to src/main/java/no/nibio/vips/coremanager/entity/VipsCoreUser.java
index e519a96..cbdac41 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java
+++ b/src/main/java/no/nibio/vips/coremanager/entity/VipsCoreUser.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 VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
-package no.bioforsk.vips.coremanager.entity;
+package no.nibio.vips.coremanager.entity;
 
 import java.io.Serializable;
 import javax.persistence.Basic;
@@ -35,8 +35,8 @@ import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
- * @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>
  */
 @Entity
 @Table(name = "vips_core_user")
@@ -125,7 +125,7 @@ public class VipsCoreUser implements Serializable {
 
     @Override
     public String toString() {
-        return "no.bioforsk.vips.coremanager.entity.VipsCoreUser[ vipsCoreUserId=" + vipsCoreUserId + " ]";
+        return "no.nibio.vips.coremanager.entity.VipsCoreUser[ vipsCoreUserId=" + vipsCoreUserId + " ]";
     }
 
 }
diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java b/src/main/java/no/nibio/vips/coremanager/service/JsonParseExceptionMapper.java
similarity index 63%
rename from src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
rename to src/main/java/no/nibio/vips/coremanager/service/JsonParseExceptionMapper.java
index 93c8af5..c036acf 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
+++ b/src/main/java/no/nibio/vips/coremanager/service/JsonParseExceptionMapper.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 VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
-package no.bioforsk.vips.coremanager.service;
+package no.nibio.vips.coremanager.service;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -27,8 +27,8 @@ import com.fasterxml.jackson.core.JsonParseException;
 /**
  * Catches when user sends in invalid JSON that causes exception to be thrown
  * in Jackson's JSON parser.
- * @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>
  */
 @Provider
 public class JsonParseExceptionMapper implements ExceptionMapper<JsonParseException>{
diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java b/src/main/java/no/nibio/vips/coremanager/service/ManagerResourceImpl.java
similarity index 92%
rename from src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java
rename to src/main/java/no/nibio/vips/coremanager/service/ManagerResourceImpl.java
index 25ae612..620dfe8 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java
+++ b/src/main/java/no/nibio/vips/coremanager/service/ManagerResourceImpl.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 VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
-package no.bioforsk.vips.coremanager.service;
+package no.nibio.vips.coremanager.service;
 
+import no.nibio.vips.coremanager.service.ManagerResource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -43,29 +44,29 @@ import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
-import no.bioforsk.vips.core.service.ModelResource;
-import no.bioforsk.vips.coremanager.session.ControllerGetter;
-import no.bioforsk.vips.coremanager.entity.ModelUsageLog;
-import no.bioforsk.vips.coremanager.entity.VIPSCoreCredentials;
-import no.bioforsk.vips.coremanager.entity.VipsCoreUser;
-import no.bioforsk.vips.entity.ModelConfiguration;
-import no.bioforsk.vips.entity.ModelRunRequest;
-import no.bioforsk.vips.model.Model;
-import no.bioforsk.vips.util.ServletUtil;
+import no.nibio.vips.core.service.ModelResource;
+import no.nibio.vips.coremanager.session.ControllerGetter;
+import no.nibio.vips.coremanager.entity.ModelUsageLog;
+import no.nibio.vips.coremanager.entity.VIPSCoreCredentials;
+import no.nibio.vips.coremanager.entity.VipsCoreUser;
+import no.nibio.vips.entity.ModelConfiguration;
+import no.nibio.vips.entity.ModelRunRequest;
+import no.nibio.vips.model.Model;
+import no.nibio.vips.util.ServletUtil;
 import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
 
 
 /**
  * Front end and manager for the services in VIPSCore
  * 
- * @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 class ManagerResourceImpl implements ManagerResource{
 
     
-    private final String VIPSCORE_URL = System.getProperty("no.bioforsk.vips.coremanager.VIPSCORE_URL");
+    private final String VIPSCORE_URL = System.getProperty("no.nibio.vips.coremanager.VIPSCORE_URL");
     private final Integer VIPS_BATCH_SYSTEM_USER_ID = -10;
     
     @Context
@@ -336,7 +337,7 @@ public class ManagerResourceImpl implements ManagerResource{
             // to find which user the batch system operates on behalf of ("batchSystemClientId")
             if(user.getVipsCoreUserId().equals(VIPS_BATCH_SYSTEM_USER_ID))
             {
-                String[] allowedIPS = System.getProperty("no.bioforsk.vips.coremanager.VIPSBATCH_ALLOWED_IPS").split(",");
+                String[] allowedIPS = System.getProperty("no.nibio.vips.coremanager.VIPSBATCH_ALLOWED_IPS").split(",");
                 String remoteIP = servletRequest.getRemoteAddr();
                 boolean isIPValid = false;
                 for(String allowedIP:allowedIPS)
diff --git a/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java b/src/main/java/no/nibio/vips/coremanager/session/ControllerGetter.java
similarity index 68%
rename from src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java
rename to src/main/java/no/nibio/vips/coremanager/session/ControllerGetter.java
index 232df69..6e6e343 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java
+++ b/src/main/java/no/nibio/vips/coremanager/session/ControllerGetter.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 VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
-package no.bioforsk.vips.coremanager.session;
+package no.nibio.vips.coremanager.session;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 /**
- * @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 ControllerGetter {
     
diff --git a/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java b/src/main/java/no/nibio/vips/coremanager/session/UserController.java
similarity index 75%
rename from src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
rename to src/main/java/no/nibio/vips/coremanager/session/UserController.java
index 63dabaf..bad6eba 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
+++ b/src/main/java/no/nibio/vips/coremanager/session/UserController.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 VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
-package no.bioforsk.vips.coremanager.session;
+package no.nibio.vips.coremanager.session;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,16 +30,16 @@ import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
-import no.bioforsk.vips.coremanager.entity.ModelUsageLog;
-import no.bioforsk.vips.coremanager.entity.Organization;
-import no.bioforsk.vips.coremanager.entity.VIPSCoreCredentials;
-import no.bioforsk.vips.coremanager.entity.VipsCoreUser;
-import no.bioforsk.vips.util.MD5Encrypter;
+import no.nibio.vips.coremanager.entity.ModelUsageLog;
+import no.nibio.vips.coremanager.entity.Organization;
+import no.nibio.vips.coremanager.entity.VIPSCoreCredentials;
+import no.nibio.vips.coremanager.entity.VipsCoreUser;
+import no.nibio.vips.util.MD5Encrypter;
 
 /**
  * Handles user related transactions
- * @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>
  */
 @LocalBean
 @Stateless
@@ -60,7 +60,7 @@ public class UserController {
     {
         Query q = em.createNamedQuery("VIPSCoreCredentials.findByUsernameAndPassword", VIPSCoreCredentials.class);
         q.setParameter("username", loginInfo.get("username"));
-        String salt = System.getProperty("no.bioforsk.vips.coremanager.MD5_SALT");
+        String salt = System.getProperty("no.nibio.vips.coremanager.MD5_SALT");
         q.setParameter("password", MD5Encrypter.getMD5HexString(loginInfo.get("password"),salt));
         try
         {
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index ee23b22..6311bc6 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+   * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
 -->
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
diff --git a/src/main/resources/server.properties b/src/main/resources/server.properties
index f6e051a..d9b0cf8 100644
--- a/src/main/resources/server.properties
+++ b/src/main/resources/server.properties
@@ -1,17 +1,17 @@
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSCoreManager.
 # VIPSCoreManager 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.
 # 
 # VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml
index 2e87e5b..c956497 100644
--- a/src/main/webapp/WEB-INF/beans.xml
+++ b/src/main/webapp/WEB-INF/beans.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
 -->
 <beans xmlns="http://java.sun.com/xml/ns/javaee"
diff --git a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 2b333ab..c843e45 100644
--- a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 
 This file is part of VIPSCore.
 VIPSCore 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.
 
 VIPSCore 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 VIPSCore.  If not, see <http://www.bioforsk.no/licenses/>.
+You should have received a copy of the NIBIO Open Source License
+along with VIPSCore.  If not, see <http://www.nibio.no/licenses/>.
 
 -->
 <jboss-deployment-structure>  
   <deployment>  
     <dependencies>  
-      <module name="no.bioforsk.vips.VIPSCommon" export="true"/>  
+      <module name="no.nibio.vips.VIPSCommon" export="true"/>  
       <module name="com.fasterxml.jackson.core.jackson-core" />
       <module name="com.fasterxml.jackson.core.jackson-databind" />
     </dependencies>  
diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml
index ea770aa..31e2754 100644
--- a/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
 -->
 <jboss-web>
diff --git a/src/main/webapp/WEB-INF/staticcss/stylesheet.css b/src/main/webapp/WEB-INF/staticcss/stylesheet.css
index a6c3d6a..8dcb6f5 100644
--- a/src/main/webapp/WEB-INF/staticcss/stylesheet.css
+++ b/src/main/webapp/WEB-INF/staticcss/stylesheet.css
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 /* 
diff --git a/src/main/webapp/WEB-INF/statichtml/index.html b/src/main/webapp/WEB-INF/statichtml/index.html
index dc1ccbb..e052b42 100644
--- a/src/main/webapp/WEB-INF/statichtml/index.html
+++ b/src/main/webapp/WEB-INF/statichtml/index.html
@@ -1,20 +1,20 @@
 <!DOCTYPE html>
 <!--
-  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+  Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
   
   This file is part of VIPSCoreManager.
   VIPSCoreManager 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.
   
   VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+  You should have received a copy of the NIBIO Open Source License
+  along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
 -->
 <html>
     <head>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 4b48ad1..12e93c5 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * VIPSCoreManager 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 VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.nibio.no/licenses/>.
  * 
 -->
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-- 
GitLab