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

---
 nb-configuration.xml                          |  1 +
 .../VIPSCoreManagerApplication.java           | 12 +++----
 .../coremanager/entity/ModelUsageLog.java     | 12 +++----
 .../vips/coremanager/entity/Organization.java | 12 +++----
 .../entity/VIPSCoreCredentials.java           | 12 +++----
 .../vips/coremanager/entity/VipsCoreUser.java | 12 +++----
 .../service/JsonParseExceptionMapper.java     | 12 +++----
 .../service/ManagerResourceImpl.java          | 12 +++----
 .../coremanager/session/ControllerGetter.java | 12 +++----
 .../coremanager/session/UserController.java   | 12 +++----
 src/main/resources/server.properties          | 32 +++++++++----------
 .../webapp/WEB-INF/staticcss/stylesheet.css   | 17 +++++-----
 src/main/webapp/WEB-INF/statichtml/index.html | 14 ++++----
 13 files changed, 87 insertions(+), 85 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/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java b/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java
index 6c96d4f..80bcd65 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * 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
- * 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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java b/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java
index a5722e0..a7947b9 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * 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
- * 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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java b/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
index e998967..0f17882 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * 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
- * 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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java b/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java
index 6e2f1b0..5fb3080 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * 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
- * 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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java b/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java
index f5c1fa6..e519a96 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * 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
- * 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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java b/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
index 2658641..31cd3be 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * 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
- * 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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java
index 7c582a2..73d516b 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * 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
- * 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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java b/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java
index 908fdd4..232df69 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * 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
- * 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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java b/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
index 23a3d63..63dabaf 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * 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
- * 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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/resources/server.properties b/src/main/resources/server.properties
index 28c84cd..f6e051a 100644
--- a/src/main/resources/server.properties
+++ b/src/main/resources/server.properties
@@ -1,17 +1,17 @@
-#    Copyright (C) 2014 Bioforsk
-#    
-#    This file is part of VIPSWeb
-#
-#    VIPSWeb 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.
-#
-#    VIPSWeb 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 VIPSWeb.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.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
+# 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.
+# 
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+# 
 
diff --git a/src/main/webapp/WEB-INF/staticcss/stylesheet.css b/src/main/webapp/WEB-INF/staticcss/stylesheet.css
index add606b..a6c3d6a 100644
--- a/src/main/webapp/WEB-INF/staticcss/stylesheet.css
+++ b/src/main/webapp/WEB-INF/staticcss/stylesheet.css
@@ -1,20 +1,21 @@
-/* 
+/*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
  * 
  * 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
- * 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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * 
+ */
 /* 
     Document   : stylesheet
     Created on : Sep 25, 2013, 10:27:12 AM
diff --git a/src/main/webapp/WEB-INF/statichtml/index.html b/src/main/webapp/WEB-INF/statichtml/index.html
index dc1d6df..abbcd78 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/>. 
- 
+  
   This file is part of VIPSCoreManager.
   VIPSCoreManager 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.
   
   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
-  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 VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the Bioforsk Open Source License
+  along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
 -->
 <html>
     <head>
-- 
GitLab