From a82f712d23fd2eec79e048d509a349b8d8af075a Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 15 Oct 2014 14:33:40 +0200
Subject: [PATCH] Changed License to Bioforsk Open Source License

---
 nb-configuration.xml                              |  1 +
 pom.xml                                           | 15 +++++++++++++++
 .../bioforsk/vips/core/VIPSCoreApplication.java   | 12 ++++++------
 .../bioforsk/vips/core/config/JacksonConfig.java  | 12 ++++++------
 .../vips/core/service/ModelResourceImpl.java      | 12 ++++++------
 .../vips/core/startup/StartupListener.java        | 12 ++++++------
 .../model/factory/DuplicateModelIdException.java  | 12 ++++++------
 .../bioforsk/vips/model/factory/ModelFactory.java | 12 ++++++------
 8 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/nb-configuration.xml b/nb-configuration.xml
index 4e3da12..be09b10 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -15,5 +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>
     </properties>
 </project-shared-configuration>
diff --git a/pom.xml b/pom.xml
index b18d459..6ea7869 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,21 @@
       <artifactId>AppleScabModel</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>no.bioforsk.vips.model</groupId>
+      <artifactId>OatFloweringModel</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>no.bioforsk.vips</groupId>
+      <artifactId>GenericPathogenPlantInfectionModel</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>no.bioforsk.vips</groupId>
+      <artifactId>GrassDryingModel</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>javax</groupId>
       <artifactId>javaee-web-api</artifactId>
diff --git a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
index 9e2684a..1e10216 100644
--- a/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
+++ b/src/main/java/no/bioforsk/vips/core/VIPSCoreApplication.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCore.
  * VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
  * 
  * 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
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCore.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java b/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java
index 260b275..00dc88a 100644
--- a/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java
+++ b/src/main/java/no/bioforsk/vips/core/config/JacksonConfig.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCore.
  * VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
  * 
  * 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
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCore.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
index 40a3b54..0eed04c 100644
--- a/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/bioforsk/vips/core/service/ModelResourceImpl.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCore.
  * VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
  * 
  * 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
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCore.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java b/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
index 56078c7..19a01bd 100644
--- a/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
+++ b/src/main/java/no/bioforsk/vips/core/startup/StartupListener.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCore.
  * VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
  * 
  * 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
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCore.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java b/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
index 40f1bb0..f4cf918 100644
--- a/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
+++ b/src/main/java/no/bioforsk/vips/model/factory/DuplicateModelIdException.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCore.
  * VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
  * 
  * 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
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCore.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
index 9b64ae1..d89b5f7 100644
--- a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
+++ b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCore.
  * VIPSCore is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
  * 
  * 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
- * GNU Affero General Public License for more details.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCore.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCore.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
-- 
GitLab