From 8bb0b72579084b31a5acc73b63a9b843802a776e Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Fri, 8 Feb 2019 11:35:09 +0100
Subject: [PATCH] Changing license to GNU Affero GPL v3

---
 nb-configuration.xml                          |  2 +-
 .../fallarmywormmodel/FallArmywormModel.java  | 12 +++++-----
 .../FallArmywormModelJSAdapter.java           | 18 +++++++--------
 .../model/fallarmywormmodel/texts.properties  | 22 ++++++++++---------
 .../fallarmywormmodel/texts_nb.properties     | 22 ++++++++++---------
 .../FallArmywormModelTest.java                | 12 +++++-----
 6 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/nb-configuration.xml b/nb-configuration.xml
index 313791e..6995d35 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -13,7 +13,7 @@ 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>nibio_open_source_license.ftl</netbeans.hint.license>
+        <netbeans.hint.license>default_1</netbeans.hint.license>
         <org-netbeans-modules-javascript2-editor.jsversion>ECMA5</org-netbeans-modules-javascript2-editor.jsversion>
         <netbeans.hint.jdkPlatform>JDK_1.8_SUN</netbeans.hint.jdkPlatform>
     </properties>
diff --git a/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java b/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java
index edbd32b..2999eaf 100644
--- a/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java
+++ b/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of FallArmywormModel.
  * FallArmywormModel 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.
+ * 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.
  * 
  * FallArmywormModel 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.
+ * GNU Affero General Public License for more details.
  * 
- * You should have received a copy of the NIBIO Open Source License
- * along with FallArmywormModel.  If not, see <http://www.nibio.no/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with FallArmywormModel.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModelJSAdapter.java b/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModelJSAdapter.java
index d6b77e0..c88b057 100644
--- a/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModelJSAdapter.java
+++ b/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModelJSAdapter.java
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2019 NIBIO <http://www.nibio.no/>. 
  * 
- * This file is part of FallArmywormModelJSAdapter.
- * FallArmywormModelJSAdapter 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.
+ * This file is part of FallArmywormModel.
+ * FallArmywormModel 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.
  * 
- * FallArmywormModelJSAdapter is distributed in the hope that it will be useful,
+ * FallArmywormModel 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.
+ * GNU Affero General Public License for more details.
  * 
- * You should have received a copy of the NIBIO Open Source License
- * along with FallArmywormModelJSAdapter.  If not, see <http://www.nibio.no/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with FallArmywormModel.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 
diff --git a/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts.properties b/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts.properties
index 9169ae1..52875b1 100644
--- a/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts.properties
+++ b/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts.properties
@@ -1,19 +1,21 @@
-# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
+#
+# Copyright (c) 2019 NIBIO <http://www.nibio.no/>. 
 # 
-# This file is part of AppleScabModel.
-# AppleScabModel 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.
+# This file is part of FallArmywormModel.
+# FallArmywormModel 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.
 # 
-# AppleScabModel is distributed in the hope that it will be useful,
+# FallArmywormModel 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.
+# GNU Affero General Public License for more details.
 # 
-# You should have received a copy of the NIBIO Open Source License
-# along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>.
+# You should have received a copy of the GNU Affero General Public License
+# along with FallArmywormModel.  If not, see <http://www.gnu.org/licenses/>.
 # 
+#
 
 name=Fall Armyworm Model
 usage=TODO
diff --git a/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts_nb.properties b/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts_nb.properties
index e38bbe8..b5c2d94 100644
--- a/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts_nb.properties
+++ b/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts_nb.properties
@@ -1,19 +1,21 @@
-# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
+#
+# Copyright (c) 2019 NIBIO <http://www.nibio.no/>. 
 # 
-# This file is part of AppleScabModel.
-# AppleScabModel 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.
+# This file is part of FallArmywormModel.
+# FallArmywormModel 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.
 # 
-# AppleScabModel is distributed in the hope that it will be useful,
+# FallArmywormModel 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.
+# GNU Affero General Public License for more details.
 # 
-# You should have received a copy of the NIBIO Open Source License
-# along with AppleScabModel.  If not, see <http://www.nibio.no/licenses/>.
+# You should have received a copy of the GNU Affero General Public License
+# along with FallArmywormModel.  If not, see <http://www.gnu.org/licenses/>.
 # 
+#
 
 
 name=Fall Armyworm-modell
diff --git a/src/test/java/nio/nibio/vips/model/fallarmywormmodel/FallArmywormModelTest.java b/src/test/java/nio/nibio/vips/model/fallarmywormmodel/FallArmywormModelTest.java
index 4163601..9b53df6 100644
--- a/src/test/java/nio/nibio/vips/model/fallarmywormmodel/FallArmywormModelTest.java
+++ b/src/test/java/nio/nibio/vips/model/fallarmywormmodel/FallArmywormModelTest.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of FallArmywormModel.
  * FallArmywormModel 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.
+ * 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.
  * 
  * FallArmywormModel 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.
+ * GNU Affero General Public License for more details.
  * 
- * You should have received a copy of the NIBIO Open Source License
- * along with FallArmywormModel.  If not, see <http://www.nibio.no/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with FallArmywormModel.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
 package nio.nibio.vips.model.fallarmywormmodel;
-- 
GitLab