Changed License to Bioforsk Open Source License

nb-configuration.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+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>
+    </properties>
+</project-shared-configuration>

src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java

 /*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPS/NaerstadModel.
- * VIPS/NaerstadModel 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.
+ * This file is part of NaerstadModel.
+ * NaerstadModel 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
+ * later version.
  * 
- * VIPS/NaerstadModel is distributed in the hope that it will be useful,
+ * NaerstadModel 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 VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with NaerstadModel.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 package no.bioforsk.vips.model.naerstadmodel;

src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java

 /*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPS/NaerstadModel.
- * VIPS/NaerstadModel 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.
+ * This file is part of NaerstadModel.
+ * NaerstadModel 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
+ * later version.
  * 
- * VIPS/NaerstadModel is distributed in the hope that it will be useful,
+ * NaerstadModel 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 VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with NaerstadModel.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 package no.bioforsk.vips.model.naerstadmodel;

src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties

-#    Copyright (C) 2014 Bioforsk
-#    
-#    This file is part of VIPS/NaerstadModel
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
 #
-#    VIPS/NaerstadModel 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.
-#
-#    VIPS/NaerstadModel 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.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with VIPS/NaerstadModel.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of NaerstadModel.
+# NaerstadModel 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
+# later version.
+# 
+# NaerstadModel 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.
+# 
+# You should have received a copy of the Bioforsk Open Source License
+# along with NaerstadModel.  If not, see <http://www.bioforsk.no/licenses/>.
+# 
 
 
 name=Naerstad Model

src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java

 /*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
- * This file is part of VIPS/NaerstadModel.
- * VIPS/NaerstadModel 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.
+ * This file is part of NaerstadModel.
+ * NaerstadModel 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
+ * later version.
  * 
- * VIPS/NaerstadModel is distributed in the hope that it will be useful,
+ * NaerstadModel 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 VIPS/NaerstadModel.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with NaerstadModel.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */