diff --git a/nb-configuration.xml b/nb-configuration.xml
index bfe05d759996a72e4da6e33522b991fb2260be00..c8c1c51b88d7d6f072939bf2062e7ce3a2cf972b 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -17,6 +17,6 @@ Any value defined here will override the pom.xml file value but is only applicab
<org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
<org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>js</org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>
<org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>JBoss4</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
- <netbeans.hint.license>default_1</netbeans.hint.license>
+ <netbeans.hint.license>bioforsk_open_source_license.ftl</netbeans.hint.license>
</properties>
</project-shared-configuration>
diff --git a/src/main/java/no/bioforsk/vips/logic/VIPSLogicApplication.java b/src/main/java/no/bioforsk/vips/logic/VIPSLogicApplication.java
index 423abd7cff0bf0cc7ff0d0156fa327cc35257fdb..74b3d3ab71c90f01bb175fc938f8a55bf8010bf7 100644
--- a/src/main/java/no/bioforsk/vips/logic/VIPSLogicApplication.java
+++ b/src/main/java/no/bioforsk/vips/logic/VIPSLogicApplication.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
@@ -55,8 +55,6 @@ public class VIPSLogicApplication extends Application
* given list with all resources defined in the project.
*/
private void addRestResourceClasses(Set<Class<?>> resources) {
- resources.add(no.bioforsk.vips.core.service.ModelResource.class);
- resources.add(no.bioforsk.vips.coremanager.service.ManagerResource.class);
resources.add(no.bioforsk.vips.logic.service.LogicService.class);
}
diff --git a/src/main/java/no/bioforsk/vips/logic/authenticate/AuthenticationFilter.java b/src/main/java/no/bioforsk/vips/logic/authenticate/AuthenticationFilter.java
index 2223dc36747dd5e4e74f464f743dbe694e80cd43..fa90ed87a28d7b3f145914d7a30094a5da9207c4 100644
--- a/src/main/java/no/bioforsk/vips/logic/authenticate/AuthenticationFilter.java
+++ b/src/main/java/no/bioforsk/vips/logic/authenticate/AuthenticationFilter.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdAuthAttributes.java b/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdAuthAttributes.java
index a14f7205d7cd3f982ec576ca90f2c4defcea123e..3ccd99fb1109fbd580d34521a76b44795ee33f2f 100644
--- a/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdAuthAttributes.java
+++ b/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdAuthAttributes.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdRelyingParty.java b/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdRelyingParty.java
index 20584f2697cc00b31845577b87600acf1b16419a..bdf36392f4ecfeab8fb1c4f124c80f739666bc27 100644
--- a/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdRelyingParty.java
+++ b/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdRelyingParty.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/authenticate/PasswordValidationException.java b/src/main/java/no/bioforsk/vips/logic/authenticate/PasswordValidationException.java
index a05a3b3c48c1ce2c694a3bdbb84a57747b62384d..7beaba34d0105b81abe8ec216d5f4e313e3c10ac 100644
--- a/src/main/java/no/bioforsk/vips/logic/authenticate/PasswordValidationException.java
+++ b/src/main/java/no/bioforsk/vips/logic/authenticate/PasswordValidationException.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java
index d9bd6dcf44f1caebf5e9d4f1d92ca94648b23bea..f4f2cd2e4eaaea27a0841df3e3a110540f244fa3 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/FrontpageController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/FrontpageController.java
index e534c950cddfb0eb652b95086d93deca44e4f610..572910bd8182ce681d551d8b9f9c5f43939c9019 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/FrontpageController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/FrontpageController.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/HttpErrorServlet.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/HttpErrorServlet.java
index 46ed5dea14f4b76d3ed4208175d19b994275ab44..b18b9ff207b3958ea892559942a5ed1bfc862b8d 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/HttpErrorServlet.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/HttpErrorServlet.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/LoginController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/LoginController.java
index e0052848ad52a33e3ea95520734373845888fe94..0e9644dafefacdf622570ad536497ed720773b7f 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/LoginController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/LoginController.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/MessageController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/MessageController.java
index 1d84bb29279ba503a5a0716a12eee0d10f92b376..825b28b301f0389526a052c5150847e0a9925f9b 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/MessageController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/MessageController.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/ObservationController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/ObservationController.java
index 2bc1d865518c6e07d7ee2bd5a8c5e192b093d97f..eabea7c0b56c5a4dcd7bdf7e6f04b404e359463d 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/ObservationController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/ObservationController.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/OrganismController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/OrganismController.java
index 6c0bc56c031cbad56e7fc6b5ec86c325a9295d0f..30eff688aa2a686587ef22f803f9704ba710e168 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/OrganismController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/OrganismController.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/PointOfInterestController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/PointOfInterestController.java
index 6f02174cac0268f3d5180e9652db3b24b9fe3d41..2994972179f2e6909e673164df809a9a7f1e083a 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/PointOfInterestController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/PointOfInterestController.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/SchedulingController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/SchedulingController.java
index 8ad491e84c5d71332ab4c1daaac15aa40fcd12f2..7c373d3846d5a1c224018b6af286982e25493f44 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/SchedulingController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/SchedulingController.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/TestFreemarker.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/TestFreemarker.java
index 088fad36dcecd073c5bdba9af26363f70d50676c..2c080aba18177d4cea861832fe5ba8e7a05a9b43 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/TestFreemarker.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/TestFreemarker.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/UserController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/UserController.java
index 6c334d95d2639a765051a2dd0dcd4245c502b3a5..f4ff8257bab63f111ce1be07ff2cca57b3c49464 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/UserController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/UserController.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/ForecastBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/ForecastBean.java
index d950c72068f590fed9fbd69605f59affcfd0121b..4a68c224cc16a07c796435ad16d086f78072f6bb 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/ForecastBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/ForecastBean.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
@@ -484,7 +484,7 @@ public class ForecastBean {
*/
private List<PointOfInterest> getPointOfInterestForecastsAggregate(Integer organizationId, List<Integer> cropOrganismIds, Date theDate) {
// TODO: More precise gathering of POIs...
- List<PointOfInterest> pois = null;
+ List<PointOfInterest> pois;
if(organizationId != null && organizationId > 0)
{
pois = em.createNamedQuery("PointOfInterest.findByOrganizationId")
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/MessageBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/MessageBean.java
index 1798599435e5403c44943f5e62963f49f09e6273..0b8580c860927380dd6b119a07dbf61cb8aa7406 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/MessageBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/MessageBean.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/ObservationBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/ObservationBean.java
index 4f6c143a239fe4333de368c04ec535fe9d88438c..e6d8a0f7859471be3c4aca5b41757a2993175163 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/ObservationBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/ObservationBean.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/OrganismBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/OrganismBean.java
index 2afecb38fc99e5d54386be1d174f9b2d9c9683a2..17e9b5792c104246dd6cb5862fa2626f475f4bd2 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/OrganismBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/OrganismBean.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/PointOfInterestBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/PointOfInterestBean.java
index d1e704f647a54a885d327f8f11b1e41eb44efccf..a6d45b60da36fcb97e9aedc60713713caf3115e2 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/PointOfInterestBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/PointOfInterestBean.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/SchedulingBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/SchedulingBean.java
index 500258f791c2bdd3617661cf137603537200b038..7976b6587582224207fc162fb92bd74fabe7614a 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/SchedulingBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/SchedulingBean.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/UserBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/UserBean.java
index 7b39d43c961db63b37c2a0f2e7bed1d85bcfbbc3..c4703dcccf4335950b014879303bbffebe9651aa 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/UserBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/UserBean.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/Country.java b/src/main/java/no/bioforsk/vips/logic/entity/Country.java
index 1ed4cf116c4ef05df183671418960c5f183015d2..2d0c3bfd20a201fb3e502d46da65f1d32f2cfd6a 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/Country.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/Country.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ExternalResource.java b/src/main/java/no/bioforsk/vips/logic/entity/ExternalResource.java
index d766d6cee5376287af7b14080969a5751cdee7cc..c12d348513dde7ef21b84f3481fd2d623dd27358 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ExternalResource.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ExternalResource.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ExternalResourceType.java b/src/main/java/no/bioforsk/vips/logic/entity/ExternalResourceType.java
index fbe7aed129ae63b3081a976f90706e6e79419740..fcb7332516d67093d2905b8250686714e304400c 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ExternalResourceType.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ExternalResourceType.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ForecastConfiguration.java b/src/main/java/no/bioforsk/vips/logic/entity/ForecastConfiguration.java
index e3db43c5d58d86ed246ae1dd89004b8e2fec3a58..21c3547f3058e1448ca3b7fbf98f38141ed04f64 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ForecastConfiguration.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ForecastConfiguration.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfiguration.java b/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfiguration.java
index 343cf2e4726aa5405ce48e66ff3cc274f0a3b49b..a18a4d851eba8779b1cd8fc9e26f2e6517928949 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfiguration.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfiguration.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfigurationPK.java b/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfigurationPK.java
index 8f404502a4705abe77f11185fd71ccb5111fb021..a9737546e594f3dc232b9a1ea390aa0c423d161f 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfigurationPK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfigurationPK.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ForecastResult.java b/src/main/java/no/bioforsk/vips/logic/entity/ForecastResult.java
index fc85e9b3b41c7f68aa211e0d7a75541a65a7205b..3202aacd4f969525a2719cb4e00fa3354a7a9717 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ForecastResult.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ForecastResult.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategory.java b/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategory.java
index f3c737dd1c95b8e787769c00fb6a4a5ebd1cd446..96aa828905afbe7a273dba93a14d8baf2e7a582d 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategory.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategory.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategoryLocale.java b/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategoryLocale.java
index 84942351fa4d17761afae713282b013cb74e1ddd..bd9bfe88e20b7e569315837ab2bb0c3c8c6f6dba 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategoryLocale.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategoryLocale.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategoryLocalePK.java b/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategoryLocalePK.java
index 8566fa1665ae993d68f81c56cadb4871a1b94a00..c014f1c07d19b11dcdd0a2506a651ad270de2cc3 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategoryLocalePK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategoryLocalePK.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/Message.java b/src/main/java/no/bioforsk/vips/logic/entity/Message.java
index 9a25608bc881f0b38d14ce59c33ed3cb7d599c88..9892d68cabdf96cb7bec6ab3e21ec5a0f138a247 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/Message.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/Message.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustration.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustration.java
index 4d9a7042bcd12af0f66c7eb8ce150c5715d64f9b..3d25777d44fa42b222f06b77876d76a579dbe30d 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustration.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustration.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationCaptionLocale.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationCaptionLocale.java
index 232ccbf86d02699198473f981b05ed1b236397c6..43f3d40dc8005827fe68fab6b67da2d44b4a673b 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationCaptionLocale.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationCaptionLocale.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationCaptionLocalePK.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationCaptionLocalePK.java
index 7fbfdccd48e3e82e3ecd79645392d964034bc14f..4688a89546383e28bb899ebdddc197f6913d8cc2 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationCaptionLocalePK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationCaptionLocalePK.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationPK.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationPK.java
index 4eb51e4d8ffa2814100862fdebfb70ef81c11c03..d98180205587398f195f7e85d6b3c8c69a1327be 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationPK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageIllustrationPK.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageLocale.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageLocale.java
index 2ba27516795a4288e662d4e7fcd393829c3c6731..5aca5ef923c3c7ae002b5dc32ccd53e57b37a524 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/MessageLocale.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageLocale.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageLocalePK.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageLocalePK.java
index 827feaad488ed94e9f2f7cdd16b0706c1df23141..2066d0e6aab8b340fbddb5eb1c80424ad8624d7c 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/MessageLocalePK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageLocalePK.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageTag.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageTag.java
index b0fda8bf7ac4496a7ce04b1c0b8f62772f74ef76..3f9fd15baed344d541e533b8ba5352a243a0775f 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/MessageTag.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageTag.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocale.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocale.java
index 4a5a9074f78bdc28e74c2be99337db5a359c4137..d0c476b6d7428cc6bd9182d08ab9fecb1a9c0d76 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocale.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocale.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocalePK.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocalePK.java
index fe43b0332e09cd1e306ad166025be5b8a0fa1344..a0992541bd50a5c918b5209052b463df9e4359a7 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocalePK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocalePK.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ModelInformation.java b/src/main/java/no/bioforsk/vips/logic/entity/ModelInformation.java
index 7ea6efbbdbc495dc0a0977eb7e944f60923188a9..560d1722e43af30ef9f08ebd64a4b4f69d000faa 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ModelInformation.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ModelInformation.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/Observation.java b/src/main/java/no/bioforsk/vips/logic/entity/Observation.java
index cb123fec8e3e3c22a13d13c7a793f51f9f205ccb..368b14bddf397bdfb9d135b9bb408ddf0930397d 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/Observation.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/Observation.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ObservationMethod.java b/src/main/java/no/bioforsk/vips/logic/entity/ObservationMethod.java
index d8ac2317feca238e3b7cc5614cc8983cb184fe4e..4565eab4f7dde5647601919c353f35d98aa9f3f1 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ObservationMethod.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ObservationMethod.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/Organism.java b/src/main/java/no/bioforsk/vips/logic/entity/Organism.java
index 3ea50f35754926139ec6d55f1d102367148ca50a..f1733cae38de8de3dfee1c16522c4e50f8232080 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/Organism.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/Organism.java
@@ -1,22 +1,21 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
-
package no.bioforsk.vips.logic.entity;
import java.io.Serializable;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResource.java b/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResource.java
index 8e82b7a2fe4b3ccc6982fb02821b7dc6b94441ab..194dc4f1533c2173fee43905510d80b4637445a9 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResource.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResource.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResourcePK.java b/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResourcePK.java
index 47771a5021aefa0d0e0debd440cbbdea98553854..72d444f83311efe8731514b14f836b9542906a83 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResourcePK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResourcePK.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/OrganismLocale.java b/src/main/java/no/bioforsk/vips/logic/entity/OrganismLocale.java
index 69cd61975edd7a7061e1ddfc59343532e5162a26..ddac9da5977fd61f50ff1eb16f4b32a324fe9ae6 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/OrganismLocale.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/OrganismLocale.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/OrganismLocalePK.java b/src/main/java/no/bioforsk/vips/logic/entity/OrganismLocalePK.java
index 5b290fc2621ef58e2007db055d6a0c8de683af92..21f6611339eec34cd6b1901933a17fe976c1c0c1 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/OrganismLocalePK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/OrganismLocalePK.java
@@ -1,22 +1,21 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
-
package no.bioforsk.vips.logic.entity;
import java.io.Serializable;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/Organization.java b/src/main/java/no/bioforsk/vips/logic/entity/Organization.java
index 8c0c9ba3204e6cf2359e1f7fc1e506870c223853..4586171150487ff8191272bb4ab3afca464319eb 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/Organization.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/Organization.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterest.java b/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterest.java
index 619c60ed479ec89f2c62dbe15a78a5126fd3bd33..65880f9020d09c48a45a079545db3525f5163388 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterest.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterest.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestType.java b/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestType.java
index d3ac34b1dfe212655336bb93f696f2195e4dd076..0b110523f742b6231e7d2f98d7d74a6eec35fe9a 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestType.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestType.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestWeatherStation.java b/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestWeatherStation.java
index 7254b146a42bfb7dd4416fecd5c224d0eb12572f..6146639a1e5de5a246cef7fb5ad2a6b3aa012f62 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestWeatherStation.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestWeatherStation.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/TaskHistory.java b/src/main/java/no/bioforsk/vips/logic/entity/TaskHistory.java
index 8819d6e727aafbeb36e9b61c24b2c4898e590358..f382396f065e7c9840f0c55e0fcfa5169b00df1d 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/TaskHistory.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/TaskHistory.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/TaskHistoryStatus.java b/src/main/java/no/bioforsk/vips/logic/entity/TaskHistoryStatus.java
index 457ae29ad7b66cb1bc6b9cd17c04cd7d374a091e..d23a68137971316f9af65d1a78cdd4c5a6553e2b 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/TaskHistoryStatus.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/TaskHistoryStatus.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthentication.java b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthentication.java
index c3d06a713b9cf2f82cc761ec4b124de3bc76210c..9eaaf415dc57ce0896d481e0f945400a4efa8867 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthentication.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthentication.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationPK.java b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationPK.java
index f9b2e36ed8c75ea500a5daf9e815efda6236ffa6..c582d0e62419288a8f3c13cd007b3aa37c550197 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationPK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationPK.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationType.java b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationType.java
index f854565c93d53fe3faca7b66eef3e7f04caa58e4..470309b3b324ae8b552be87f00bf8540f49e9c33 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationType.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationType.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterest.java b/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterest.java
index 23587f20255fa37510e24559a4212bc43baaac3e..5ac3ae1bcf4465748b81ceed3d94422d6f2778a4 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterest.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterest.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterestPK.java b/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterestPK.java
index c1d95d6abba3fb942e03bd4c23054a0f3510e504..0c1187a9aa4f4b0b6b76e49de029265eef4a5e0c 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterestPK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterestPK.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicRole.java b/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicRole.java
index af526dd3df8d263e9ba337a7464b7ecf62b9e4f5..965a525178a1283b9ba907c71b6d00b9418db354 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicRole.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicRole.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicUser.java b/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicUser.java
index 1a528cebf6c5de047b6de42ba6501dcc0b09c1e3..6a02eae7bc71079c90e06111b2b54fac9dec6a4a 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicUser.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicUser.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/WeatherStationDataSource.java b/src/main/java/no/bioforsk/vips/logic/entity/WeatherStationDataSource.java
index 9aaac8f85133f2aca6d0ffa0f838c62634b4e8ba..cf770004246105d6aa78e974357805971a4154c2 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/WeatherStationDataSource.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/WeatherStationDataSource.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/helpers/HstoreHelper.java b/src/main/java/no/bioforsk/vips/logic/entity/helpers/HstoreHelper.java
index d65e235a062975a460ffe315dca50fea0f2fa8eb..1886664d9962ea6eaef4385189beed53f87f6ccb 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/helpers/HstoreHelper.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/helpers/HstoreHelper.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/i18n/CharacterEncodingFilter.java b/src/main/java/no/bioforsk/vips/logic/i18n/CharacterEncodingFilter.java
index f30f234fb3f0510fa426451951ceace83c8c08b9..353c945fc9309d60fde457d671348c62af208dff 100644
--- a/src/main/java/no/bioforsk/vips/logic/i18n/CharacterEncodingFilter.java
+++ b/src/main/java/no/bioforsk/vips/logic/i18n/CharacterEncodingFilter.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/i18n/LocalizationFilter.java b/src/main/java/no/bioforsk/vips/logic/i18n/LocalizationFilter.java
index 60460031eb3cbf1ea3d25215898e9c79dc977ac4..1ad1f01bf4ae36998e79c1d9c7863bb3e5b58dea 100644
--- a/src/main/java/no/bioforsk/vips/logic/i18n/LocalizationFilter.java
+++ b/src/main/java/no/bioforsk/vips/logic/i18n/LocalizationFilter.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/i18n/ResourceBundleJSServlet.java b/src/main/java/no/bioforsk/vips/logic/i18n/ResourceBundleJSServlet.java
index f323e2bf5acdb5503b0e051bb2e5b95a01cbc10c..4eb170986a678d4ffffd5d314baf4ecfc568f5ec 100644
--- a/src/main/java/no/bioforsk/vips/logic/i18n/ResourceBundleJSServlet.java
+++ b/src/main/java/no/bioforsk/vips/logic/i18n/ResourceBundleJSServlet.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/i18n/SessionLocaleUtil.java b/src/main/java/no/bioforsk/vips/logic/i18n/SessionLocaleUtil.java
index 97c9d8161243f4c37a4f830d4bc247197a467150..10118d9054bff405e9d8f5dd65c295737e9fe53a 100644
--- a/src/main/java/no/bioforsk/vips/logic/i18n/SessionLocaleUtil.java
+++ b/src/main/java/no/bioforsk/vips/logic/i18n/SessionLocaleUtil.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingTest.java b/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingTest.java
index 92001f85f27862b8056851963ef58ca77df08003..702cb0b480e243947b73519b95ec7ce1b70e7d2b 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingTest.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingTest.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingUtil.java b/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingUtil.java
index a6a719d7444aee464f78b555fd2dab4e22c02345..5a24a91a31a603aceb5c8732c2c5786c5b38b394 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingUtil.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingUtil.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/TaskLoggerSchedulerListener.java b/src/main/java/no/bioforsk/vips/logic/scheduling/TaskLoggerSchedulerListener.java
index fc84a6653ddf20aec2d393936e9c492cce801381..fa3fc2906910d0a67ec5973e454b2a7d15bd74d1 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/TaskLoggerSchedulerListener.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/TaskLoggerSchedulerListener.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/TerminateSchedulerListener.java b/src/main/java/no/bioforsk/vips/logic/scheduling/TerminateSchedulerListener.java
index 68146dbed1e4dbab5d5e6909303c24edfe9ea89c..989f4956f6069b6c31f75f60e729f1b4012a3f4b 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/TerminateSchedulerListener.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/TerminateSchedulerListener.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/VIPSLogicTaskCollector.java b/src/main/java/no/bioforsk/vips/logic/scheduling/VIPSLogicTaskCollector.java
index f76a879782ee6590d5b36706cb112d899fe442f6..dbd5372d00e6af2909db3341b3251347a57924bc 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/VIPSLogicTaskCollector.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/VIPSLogicTaskCollector.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/VipsLogicTask.java b/src/main/java/no/bioforsk/vips/logic/scheduling/VipsLogicTask.java
index 26318033b50f9422daa85cfd48df3090b021029e..91cc8a28a8e5bec1a01152ebfd4682f23e16b0e1 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/VipsLogicTask.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/VipsLogicTask.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/VipsLogicTaskFactory.java b/src/main/java/no/bioforsk/vips/logic/scheduling/VipsLogicTaskFactory.java
index ab4b55dd8cbf884f1331cdfc3d85310ce7c54de5..62e1b70394b3948d19174d81d7a64788a518dc17 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/VipsLogicTaskFactory.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/VipsLogicTaskFactory.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessor.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessor.java
index 83398da36d008c9d0a9dab75b1316a99134d259b..dbd494212d1304414f99a63e1a41e46133adc689 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessor.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessor.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessorFactory.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessorFactory.java
index a51e0de3bfd19c3dc401bc8fc9fc0db2d77294f4..7e4a0bbba584a9e0a60175d04b2fb4576fe10418 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessorFactory.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessorFactory.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/PreprocessorException.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/PreprocessorException.java
index 951bcbc9b17644378a0dbd6cde6e3ec84e770d19..e98ee62c573ae26181661d56f692f4f6a12807bc 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/PreprocessorException.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/PreprocessorException.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/RunAppleScabModelForOrganizationTask.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/RunAppleScabModelForOrganizationTask.java
index 00a547053348a790bf1e1d176a2a378c614db02b..3621ce6dad27cbf2313956a29a66315421b7d1a1 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/RunAppleScabModelForOrganizationTask.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/RunAppleScabModelForOrganizationTask.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/preprocessor/AppleScabModelPreprocessor.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/preprocessor/AppleScabModelPreprocessor.java
index af89de602e60ffcbaa98d2213d58758864ccb049..1888cda6301e764d31d665087b8cc79a7ab4ba4b 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/preprocessor/AppleScabModelPreprocessor.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/preprocessor/AppleScabModelPreprocessor.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
package no.bioforsk.vips.logic.scheduling.model.preprocessor;
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/preprocessor/NaerstadModelPreprocessor.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/preprocessor/NaerstadModelPreprocessor.java
index 2b587d8264bc2faf654bf3cdfe6cf8c7862d3ee6..1a5daefb2dcf053bf309cdc21f43dc55ee11b543 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/preprocessor/NaerstadModelPreprocessor.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/preprocessor/NaerstadModelPreprocessor.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java b/src/main/java/no/bioforsk/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java
index 3554df484da2eedf2c037034e2dc7628f4911074..5256923e8904e8ef42db3f090e07d77d36e91e6b 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/tasks/RunAllForecastConfigurationsTask.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/tasks/UpdateModelInformationTask.java b/src/main/java/no/bioforsk/vips/logic/scheduling/tasks/UpdateModelInformationTask.java
index 149d91c6ad11c0a9fdceea58a5b710bf9a8e4646..2c5ec20e0003ac3ec4c986258ea0107ea6fc27f0 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/tasks/UpdateModelInformationTask.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/tasks/UpdateModelInformationTask.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/service/LogicService.java b/src/main/java/no/bioforsk/vips/logic/service/LogicService.java
index 33bda241b0d22b5ab4b1c98a8fb05387d7996cf7..cab2c343542b6830fe2593643a6eae6ca34e5721 100644
--- a/src/main/java/no/bioforsk/vips/logic/service/LogicService.java
+++ b/src/main/java/no/bioforsk/vips/logic/service/LogicService.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/startup/StartupListener.java b/src/main/java/no/bioforsk/vips/logic/startup/StartupListener.java
index 1619516b2424920af0551149363826276ab82ed6..2e657b1eb7520b06da91188fd63bb990f3a7dea4 100644
--- a/src/main/java/no/bioforsk/vips/logic/startup/StartupListener.java
+++ b/src/main/java/no/bioforsk/vips/logic/startup/StartupListener.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/util/Globals.java b/src/main/java/no/bioforsk/vips/logic/util/Globals.java
index df8c971024542cf22efe69e9974b20646ca7921f..b27a63517ca20ba1c280d378b7d34c06411442f6 100644
--- a/src/main/java/no/bioforsk/vips/logic/util/Globals.java
+++ b/src/main/java/no/bioforsk/vips/logic/util/Globals.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/util/HierarchyCategoryLocaleNames.java b/src/main/java/no/bioforsk/vips/logic/util/HierarchyCategoryLocaleNames.java
index 6905fc2bb60a24a0a180dadd58f6f38c0c19cc7f..9df0ee914fb6377129f3185176421ddc9227c78a 100644
--- a/src/main/java/no/bioforsk/vips/logic/util/HierarchyCategoryLocaleNames.java
+++ b/src/main/java/no/bioforsk/vips/logic/util/HierarchyCategoryLocaleNames.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/util/RunModelException.java b/src/main/java/no/bioforsk/vips/logic/util/RunModelException.java
index 61d7c7e192e1adb64a91e58dbf5ff8d9a7ecad6f..e7372adfbf006bcaca290141a51089c9965d4321 100644
--- a/src/main/java/no/bioforsk/vips/logic/util/RunModelException.java
+++ b/src/main/java/no/bioforsk/vips/logic/util/RunModelException.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/util/SessionControllerGetter.java b/src/main/java/no/bioforsk/vips/logic/util/SessionControllerGetter.java
index 7adbbaf308f340decc6e773ac430f3c556181aaa..8a158b173e8552ac118fcc02470d4c24fbb268b6 100644
--- a/src/main/java/no/bioforsk/vips/logic/util/SessionControllerGetter.java
+++ b/src/main/java/no/bioforsk/vips/logic/util/SessionControllerGetter.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/util/SimpleMailSender.java b/src/main/java/no/bioforsk/vips/logic/util/SimpleMailSender.java
index 8b6b1f68ccb2433f6ced3d58419e087eb90e479b..7c4fb6b095f4058fa7b219204a37fd51fafd5276 100644
--- a/src/main/java/no/bioforsk/vips/logic/util/SimpleMailSender.java
+++ b/src/main/java/no/bioforsk/vips/logic/util/SimpleMailSender.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/util/StringUtils.java b/src/main/java/no/bioforsk/vips/logic/util/StringUtils.java
index a708c1ee87564280add0b8c3685027578326d7f5..d1b06301f7cd01335ac47fd2852955af62867c00 100644
--- a/src/main/java/no/bioforsk/vips/logic/util/StringUtils.java
+++ b/src/main/java/no/bioforsk/vips/logic/util/StringUtils.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/vips/logic/util/SystemTime.java b/src/main/java/no/bioforsk/vips/logic/util/SystemTime.java
index 56c35fb5c2c590cf52e79ab688e0067661d5af82..744da3d1201ec92f17130e1de351f8f301840a16 100644
--- a/src/main/java/no/bioforsk/vips/logic/util/SystemTime.java
+++ b/src/main/java/no/bioforsk/vips/logic/util/SystemTime.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/web/forms/FormField.java b/src/main/java/no/bioforsk/web/forms/FormField.java
index 3ce34303de16813657b9add0f75e398d6891d206..47ff7aee4b934235c010cc7ea0976115fb3747a5 100644
--- a/src/main/java/no/bioforsk/web/forms/FormField.java
+++ b/src/main/java/no/bioforsk/web/forms/FormField.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/web/forms/FormSelectOption.java b/src/main/java/no/bioforsk/web/forms/FormSelectOption.java
index 09eaffbd16ce9864890a1f090f6bb0481c072eec..f787cac1ed474e61e6ca43be7e734cb1e3f29c61 100644
--- a/src/main/java/no/bioforsk/web/forms/FormSelectOption.java
+++ b/src/main/java/no/bioforsk/web/forms/FormSelectOption.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/web/forms/FormUtil.java b/src/main/java/no/bioforsk/web/forms/FormUtil.java
index 6171e6bc2e759211cc621967ffd5a161fbdfbb2d..ffe8bfb3d0c9931a92416002334da0f4f7873eb9 100644
--- a/src/main/java/no/bioforsk/web/forms/FormUtil.java
+++ b/src/main/java/no/bioforsk/web/forms/FormUtil.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/web/forms/FormValidation.java b/src/main/java/no/bioforsk/web/forms/FormValidation.java
index cc6225e1afab8f898619d335b9681cb67d2e32d8..5b030af61541f6403289d82b5dbf12b6c83a4ee0 100644
--- a/src/main/java/no/bioforsk/web/forms/FormValidation.java
+++ b/src/main/java/no/bioforsk/web/forms/FormValidation.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/web/forms/FormValidationException.java b/src/main/java/no/bioforsk/web/forms/FormValidationException.java
index 16289cbe2ac7abf7e595e716d4467b4e86db221a..e724bb8e88e39a361e951d2cb7402bee86eab9a7 100644
--- a/src/main/java/no/bioforsk/web/forms/FormValidationException.java
+++ b/src/main/java/no/bioforsk/web/forms/FormValidationException.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/web/forms/FormValidator.java b/src/main/java/no/bioforsk/web/forms/FormValidator.java
index 952068f45b5318c4818bc35021cb3f8fb339bdc7..54e732ced5caa06717c10554b6a526698345ed7a 100644
--- a/src/main/java/no/bioforsk/web/forms/FormValidator.java
+++ b/src/main/java/no/bioforsk/web/forms/FormValidator.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013-2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/java/no/bioforsk/web/forms/HTMLFormGenerator.java b/src/main/java/no/bioforsk/web/forms/HTMLFormGenerator.java
index d98a42eb8ffb905486b7b85c8d75f87b43b063f1..f4a3a2e15a39bfe316c2ba81b42c1778f830e403 100644
--- a/src/main/java/no/bioforsk/web/forms/HTMLFormGenerator.java
+++ b/src/main/java/no/bioforsk/web/forms/HTMLFormGenerator.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index c69b0e480799a12fe1b623a3e7c022fc89ab7c42..fa3961c0e7cc7f907b030293cd0657201e86b9c3 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
- This file is part of VIPSLogic.
- VIPSLogic 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.
-
- VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/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">
<persistence-unit name="VIPSLogic-PU" transaction-type="JTA">
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties
index 3d1c46e59cee8eaf439ecdaeea9c7990d5babb73..9a7b1eb66186255f401ba386331f4c933fc50ee2 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSLogic
#
-# VIPSLogic 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.
-#
-# VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
invalidcredentials=Invalid username and/or password
greeting=Welcome to
logoutsuccess=You are now logged out. Welcome back!
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_bs.properties
index e301ad482fbabfac33b6892b72c6aa36727d0c6f..5b47a93f70f9573a33d5637df76f6192b59dd87e 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_bs.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_bs.properties
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSLogic
#
-# VIPSLogic 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.
-#
-# VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
invalidcredentials=Invalid username and/or password
greeting=Dobro do\u0161li u
logoutsuccess=You are now logged out. Welcome back!
@@ -21,7 +22,7 @@ pleaselogin=Please log in
login=Log in
username=User name
password=Password
-loggedinas=Logged in as
+loggedinas=Prijavi se kao
logout=Log out
weatherStations=Weather stations
position=Position
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_hr.properties
index e301ad482fbabfac33b6892b72c6aa36727d0c6f..1f4ff94c41db1875827c53429ce57f80bf2069ba 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_hr.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_hr.properties
@@ -1,20 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSLogic
#
-# VIPSLogic 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.
-#
-# VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
-invalidcredentials=Invalid username and/or password
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
greeting=Dobro do\u0161li u
logoutsuccess=You are now logged out. Welcome back!
pleaselogin=Please log in
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_nb.properties
index c4210a424f6423def4407c1b97b6a2bb28addf74..ab8633bdb645e341751518b4fe18218d6da2e72d 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_nb.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_nb.properties
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSLogic
#
-# VIPSLogic 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.
-#
-# VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
invalidcredentials=Ugyldig brukernavn og/eller passord
greeting=Velkommen til
logoutsuccess=Du er n\u00e5 logget ut. Velkommen tilbake!
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_sr.properties
index ef3c511294ec73425018073bf8cf81308ad6f28f..4bd04da42929054b919c5a7ed987079adb73d7aa 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_sr.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_sr.properties
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSLogic
#
-# VIPSLogic 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.
-#
-# VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
invalidcredentials=Invalid username and/or password
greeting=Dobro do\u0161li u
logoutsuccess=You are now logged out. Welcome back!
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword.properties
index 95c346efb3692a9c0656ac5386ad4064b4e919e6..2bbe84b373bd36bb555e379f891656b7d3f154be 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword.properties
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSLogic
#
-# VIPSLogic 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.
-#
-# VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
# This (and and corresponding localized) property file(s)
# Localizes the error messages given from the vt-password properties files
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword_nb.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword_nb.properties
index 723d2f2a0706f5b164ededc9400df83fa8cfdafe..3ace128d1bd71b39a60ee0c0a223056e6c70b984 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword_nb.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword_nb.properties
@@ -1,19 +1,20 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSLogic
#
-# VIPSLogic 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.
-#
-# VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
# This (and and corresponding localized) property file(s)
# Localizes the error messages given from the vt-password properties files
diff --git a/src/main/resources/server.properties b/src/main/resources/server.properties
index e2daac3bb0ef10ffa6c35e8ff47035f8fd09da18..3bc7062414eb01d869aced2c34e16f0e59631fb6 100644
--- a/src/main/resources/server.properties
+++ b/src/main/resources/server.properties
@@ -1,16 +1,17 @@
-# Copyright (C) 2014 Bioforsk
-#
-# This file is part of VIPSLogic
#
-# VIPSLogic 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.
-#
-# VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml
index 0194ff1939268ce1f3e3e84ab78a2c445dac3a0d..bc4f8d31f95257969570c7cec8a0b7f9df8e82ce 100644
--- a/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
- This file is part of VIPSLogic.
- VIPSLogic 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.
-
- VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ #
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
-->
<jboss-web>
<context-root>/VIPSLogic</context-root>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index b840df0276998882bf6707eb31ade0249d0c8460..460671e5127eed35381372fe6007e39e7c278cc8 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
- This file is part of VIPSLogic.
- VIPSLogic 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.
-
- VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+#
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.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">
<display-name>VIPSLogic</display-name>
diff --git a/src/main/webapp/css/signin.css b/src/main/webapp/css/signin.css
index 275d747b1d64a6fde618fbe74b3337561b0f63da..0fc48932ab8698ace95f686aa04bd0e55bc5f08a 100644
--- a/src/main/webapp/css/signin.css
+++ b/src/main/webapp/css/signin.css
@@ -1,20 +1,21 @@
-/*
+/*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
-*/
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ *
+ */
/*
Document : signin
diff --git a/src/main/webapp/css/vipslogic.css b/src/main/webapp/css/vipslogic.css
index 4dcf6011d27a78b4b8e69cfab5c9235de3df231b..8ac3a9d87d3861f5c03a6ac488e278fa4bd5edcd 100644
--- a/src/main/webapp/css/vipslogic.css
+++ b/src/main/webapp/css/vipslogic.css
@@ -1,21 +1,21 @@
-/*
+/*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ *
+ */
/*
Document : stylesheet
Created on : Aug 28, 2013, 10:55:15 AM
diff --git a/src/main/webapp/formdefinitions/forecastConfigurationForm.json b/src/main/webapp/formdefinitions/forecastConfigurationForm.json
index 7ee3060d9c338d0769eb5a3b27d739ede1cbaea3..5e4fb9187bda6b445490164e01057ffad768ed35 100644
--- a/src/main/webapp/formdefinitions/forecastConfigurationForm.json
+++ b/src/main/webapp/formdefinitions/forecastConfigurationForm.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the forecastConfigurationForm and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/messageForm.json b/src/main/webapp/formdefinitions/messageForm.json
index 7636053205cf18a35f9800508f16208420139991..6a50747af96b725c09e84ac9ab19e437554bf6f8 100644
--- a/src/main/webapp/formdefinitions/messageForm.json
+++ b/src/main/webapp/formdefinitions/messageForm.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the organismForm and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/models/APPLESCABM.json b/src/main/webapp/formdefinitions/models/APPLESCABM.json
index ec90cabba377b660be213ac2a7fd9d965dfb7120..dbd88dd829c182f6a892dc80b1cdce49917e6469 100644
--- a/src/main/webapp/formdefinitions/models/APPLESCABM.json
+++ b/src/main/webapp/formdefinitions/models/APPLESCABM.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the specific fields for APPLESCABM",
"fields": [
diff --git a/src/main/webapp/formdefinitions/models/NAERSTADMO.json b/src/main/webapp/formdefinitions/models/NAERSTADMO.json
index 9b7dba1ea2b2615ad9f5e539f8b4e8a5d9f32793..66d11a6ee145dcc33b87319ea7fb3e3af0278d0b 100644
--- a/src/main/webapp/formdefinitions/models/NAERSTADMO.json
+++ b/src/main/webapp/formdefinitions/models/NAERSTADMO.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the specific fields for NAERSTADMO",
"fields": [
diff --git a/src/main/webapp/formdefinitions/observationForm.json b/src/main/webapp/formdefinitions/observationForm.json
index 01f16d57f7558221dd01709b1965f3fa4fa936d7..1b9e54baffd936809edec05bb60d29e67dd850e8 100644
--- a/src/main/webapp/formdefinitions/observationForm.json
+++ b/src/main/webapp/formdefinitions/observationForm.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the observationForm and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/organismForm.json b/src/main/webapp/formdefinitions/organismForm.json
index 21587be9abe62cd58f0ca69d0535c29809f16acf..0b8f805667cfc64a55c43afcd1c986ce38481299 100644
--- a/src/main/webapp/formdefinitions/organismForm.json
+++ b/src/main/webapp/formdefinitions/organismForm.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the organismForm and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/resetPasswordForm.json b/src/main/webapp/formdefinitions/resetPasswordForm.json
index d60d50008b6509d005260f4127b80e3574780f89..1cf229222928a333e8d257abf5b6ead0d54cbc4f 100644
--- a/src/main/webapp/formdefinitions/resetPasswordForm.json
+++ b/src/main/webapp/formdefinitions/resetPasswordForm.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the resetPasswordForm and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/resetPasswordRequestForm.json b/src/main/webapp/formdefinitions/resetPasswordRequestForm.json
index a2f569cb95322d60c6ca6e85947ee24c932afecf..ce1dab788fceae33c3b987c29b5cc237f19119a0 100644
--- a/src/main/webapp/formdefinitions/resetPasswordRequestForm.json
+++ b/src/main/webapp/formdefinitions/resetPasswordRequestForm.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the resetPasswordRequestForm and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/taskHistoryDateForm.json b/src/main/webapp/formdefinitions/taskHistoryDateForm.json
index c9b7814930ca5859a2bb73c4cb4d23e3f121bb25..283031df2309bb6708ccbbb6cc02b0cfe9db03f8 100644
--- a/src/main/webapp/formdefinitions/taskHistoryDateForm.json
+++ b/src/main/webapp/formdefinitions/taskHistoryDateForm.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the taskHistoryDateForm and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/userForm.json b/src/main/webapp/formdefinitions/userForm.json
index c915765bc52fb33270334d6dd607d300c13e2a19..45d6f3ac46ac0343b730af7803ecc08949cc7148 100644
--- a/src/main/webapp/formdefinitions/userForm.json
+++ b/src/main/webapp/formdefinitions/userForm.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the userForm and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/userRegistrationFormType1.json b/src/main/webapp/formdefinitions/userRegistrationFormType1.json
index 96adf5f87bd635d68b815b112bf5f25ad6d00777..4a8f0a87361018c1d1ef3cacafcff9637099791c 100644
--- a/src/main/webapp/formdefinitions/userRegistrationFormType1.json
+++ b/src/main/webapp/formdefinitions/userRegistrationFormType1.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the userRegistrationForm and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/userRegistrationFormType2.json b/src/main/webapp/formdefinitions/userRegistrationFormType2.json
index 047dce9773277e25ec31b098f7ae442f6b553c2f..e87810112a7c0e3d9ffb47e5ac380f386783ddc2 100644
--- a/src/main/webapp/formdefinitions/userRegistrationFormType2.json
+++ b/src/main/webapp/formdefinitions/userRegistrationFormType2.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the userRegistrationForm for OpenId and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/userRegistrationFormType3.json b/src/main/webapp/formdefinitions/userRegistrationFormType3.json
index aee00e1d6682fdd1edac0fd016d184c2892e6012..728d5e37a23aa72d577f41791dcfe833b5e03a21 100644
--- a/src/main/webapp/formdefinitions/userRegistrationFormType3.json
+++ b/src/main/webapp/formdefinitions/userRegistrationFormType3.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the userRegistrationForm for GoogleId and how to validate it",
"fields": [
diff --git a/src/main/webapp/formdefinitions/weatherStationForm.json b/src/main/webapp/formdefinitions/weatherStationForm.json
index 449fa851a359ee29a5a0e74494186bf861e121e1..1267739199830aae0393cd45475500984dec6e50 100644
--- a/src/main/webapp/formdefinitions/weatherStationForm.json
+++ b/src/main/webapp/formdefinitions/weatherStationForm.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
- "",
- "This file is part of VIPSLogic.",
- "VIPSLogic 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.",
- "",
- "VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>."
+ "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "",
+ "This file is part of VIPSLogic. ",
+ "VIPSLogic 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. ",
+ "",
+ "VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
],
"_comment" : "Structure of the weatherStationForm and how to validate it",
"fields": [
diff --git a/src/main/webapp/js/constants.js b/src/main/webapp/js/constants.js
index 7d7a94fca0490b3c3ffdd412e7aced8193bae691..ee8cfa89af1c196c93ecf364ba20af363c3a4bac 100644
--- a/src/main/webapp/js/constants.js
+++ b/src/main/webapp/js/constants.js
@@ -1,23 +1,22 @@
-/*
+/*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
-
/*
* Constants for maps
*/
diff --git a/src/main/webapp/js/forecastConfigurationForm.js b/src/main/webapp/js/forecastConfigurationForm.js
index ee09cb98f90861942e6c6ddaa0102f19ccabcdc4..097db3f16bf34713d1ba97b9f9e4de3912fcfc24 100644
--- a/src/main/webapp/js/forecastConfigurationForm.js
+++ b/src/main/webapp/js/forecastConfigurationForm.js
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/webapp/js/observationFormMap.js b/src/main/webapp/js/observationFormMap.js
index 45ef0788a6b1a069b425e98b2cff1bd145ac2165..cb8fd39e61851279cbdfb65138654ea51ce958bc 100644
--- a/src/main/webapp/js/observationFormMap.js
+++ b/src/main/webapp/js/observationFormMap.js
@@ -1,19 +1,19 @@
-/*
+/*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/webapp/js/validateForm.js b/src/main/webapp/js/validateForm.js
index 066d7603a85dc335466fab829b1290f1216aa94f..ffbfd56f654f1b4f30de2cd2dfcba8714107d08e 100644
--- a/src/main/webapp/js/validateForm.js
+++ b/src/main/webapp/js/validateForm.js
@@ -1,22 +1,21 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
-
/*
* This validator has its Java counterpart in no.bioforsk.web.forms.FormValidator.java
* (for server side validation). They use the same JSON file for form validation.
diff --git a/src/main/webapp/js/weatherStationFormMap.js b/src/main/webapp/js/weatherStationFormMap.js
index 37e436b775f21a9631b332c184daeb00cf5c6709..f48f6de370324f458a3750f0690d4beaf9348824 100644
--- a/src/main/webapp/js/weatherStationFormMap.js
+++ b/src/main/webapp/js/weatherStationFormMap.js
@@ -1,19 +1,19 @@
-/*
+/*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/webapp/js/weatherStationListMap.js b/src/main/webapp/js/weatherStationListMap.js
index 7491ab1a623f897ee2e8528aa9f2877d840b88ab..1840fde7ddc5c148bee318c72242bd22351d2eb8 100644
--- a/src/main/webapp/js/weatherStationListMap.js
+++ b/src/main/webapp/js/weatherStationListMap.js
@@ -1,19 +1,19 @@
-/*
+/*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/webapp/js/weatherStationViewMap.js b/src/main/webapp/js/weatherStationViewMap.js
index c12c1625c392034d237e031e0511c2a664806618..8a79252c22c176fab035d3c2d1aa46152bc16b4e 100644
--- a/src/main/webapp/js/weatherStationViewMap.js
+++ b/src/main/webapp/js/weatherStationViewMap.js
@@ -1,19 +1,19 @@
-/*
+/*
* Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/main/webapp/templates/error_unknown.ftl b/src/main/webapp/templates/error_unknown.ftl
index 0a96c63849eec2f83a32642197a02468cf34b696..dda15e844aa36823a9b226cb081d71951dcf37b3 100644
--- a/src/main/webapp/templates/error_unknown.ftl
+++ b/src/main/webapp/templates/error_unknown.ftl
@@ -1,19 +1,20 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+
--><#include "master.ftl">
<#macro navbar_collapse>
</#macro>
diff --git a/src/main/webapp/templates/forecastConfigurationForm.ftl b/src/main/webapp/templates/forecastConfigurationForm.ftl
index 3850b772f1bd09b500ecd97de24500dae59bd32a..7f83caacbd8fb1e74716c4e24723c514baa4e448 100644
--- a/src/main/webapp/templates/forecastConfigurationForm.ftl
+++ b/src/main/webapp/templates/forecastConfigurationForm.ftl
@@ -1,19 +1,19 @@
<#--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+ Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title></title>
diff --git a/src/main/webapp/templates/forecastConfigurationList.ftl b/src/main/webapp/templates/forecastConfigurationList.ftl
index dbbcca369c82cc013789cfc45dcd4de01d3b2da1..896ef5016f69d99b02d52709d4e0cfa1846229ca 100644
--- a/src/main/webapp/templates/forecastConfigurationList.ftl
+++ b/src/main/webapp/templates/forecastConfigurationList.ftl
@@ -1,19 +1,19 @@
<#--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+ Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.forecasts}</title>
diff --git a/src/main/webapp/templates/index.ftl b/src/main/webapp/templates/index.ftl
index 0d7edd5285e8becbbdebf590221b12b4370bc905..2db19290720eba6df2baf1599a9c8068ab9009f7 100644
--- a/src/main/webapp/templates/index.ftl
+++ b/src/main/webapp/templates/index.ftl
@@ -1,19 +1,19 @@
<#--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+ Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.greeting} VIPSLogic</title>
diff --git a/src/main/webapp/templates/login.ftl b/src/main/webapp/templates/login.ftl
index 9c257df8f49f25a3bf0789121bababde5e1b5402..a4a263b5b7aae890dd74a077ad96e174ba1ebd6a 100644
--- a/src/main/webapp/templates/login.ftl
+++ b/src/main/webapp/templates/login.ftl
@@ -1,19 +1,19 @@
<#--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+ Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.pleaselogin}</title>
diff --git a/src/main/webapp/templates/master.ftl b/src/main/webapp/templates/master.ftl
index 91d3863b9b1d16b669231179134ad479a6604fea..070fee35f80770e9811824143a8bffa6b69daa9b 100644
--- a/src/main/webapp/templates/master.ftl
+++ b/src/main/webapp/templates/master.ftl
@@ -1,19 +1,19 @@
<#--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+ Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
-->
<#macro page_head>
<title>master title</title>
diff --git a/src/main/webapp/templates/master_errorpages.ftl b/src/main/webapp/templates/master_errorpages.ftl
index 60b9ff6ae50294643a1fb0ed3c8d96ede106e803..d0a4ae0bfff94e4c27868b09002c401676f82a91 100644
--- a/src/main/webapp/templates/master_errorpages.ftl
+++ b/src/main/webapp/templates/master_errorpages.ftl
@@ -1,19 +1,19 @@
<#--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+ Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#macro page_head>
<title>master title</title>
</#macro>
diff --git a/src/main/webapp/templates/messageForm.ftl b/src/main/webapp/templates/messageForm.ftl
index 6a0823569ae5504c17fbf42dc3009a33990bc7af..a74a3be51bacbdd21310e26d0694eb2294c5743d 100644
--- a/src/main/webapp/templates/messageForm.ftl
+++ b/src/main/webapp/templates/messageForm.ftl
@@ -1,19 +1,19 @@
<#--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+ Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#if message.getLocalMessage(messageLocale)?has_content>
diff --git a/src/main/webapp/templates/messageList.ftl b/src/main/webapp/templates/messageList.ftl
index 09328797b3faecb9bfac00f4aeba3d01f74bf96e..5b98daaf0b750e791b568874475b71780c0b8833 100644
--- a/src/main/webapp/templates/messageList.ftl
+++ b/src/main/webapp/templates/messageList.ftl
@@ -1,19 +1,19 @@
<#--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+ Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.messages}</title>
diff --git a/src/main/webapp/templates/observationForm.ftl b/src/main/webapp/templates/observationForm.ftl
index 8b50245a5973833d6c9d9ae310e061c5e7b3ad00..b21172f07a78aced5d7bae945df4b67522df5c04 100644
--- a/src/main/webapp/templates/observationForm.ftl
+++ b/src/main/webapp/templates/observationForm.ftl
@@ -1,19 +1,19 @@
<#--
- Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+ Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title><#if observation.observationId?has_content>${i18nBundle.editObservation}<#else>${i18nBundle.newObservation}</#if></title>
diff --git a/src/main/webapp/templates/observationList.ftl b/src/main/webapp/templates/observationList.ftl
index a8ff018e1df92ecedf9096dc69cd00e39bcfaaf6..a239e0e69b433b388740945c4c6e9a4e48638daf 100644
--- a/src/main/webapp/templates/observationList.ftl
+++ b/src/main/webapp/templates/observationList.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.observations}</title>
diff --git a/src/main/webapp/templates/organism.ftl b/src/main/webapp/templates/organism.ftl
index 2acebd9c8a31b43a8491ef03994b4055725ca19f..f81d7fc1675380e48b2b7ba3644e8b268f292ed3 100644
--- a/src/main/webapp/templates/organism.ftl
+++ b/src/main/webapp/templates/organism.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.organisms}</title>
diff --git a/src/main/webapp/templates/organismDetails.ftl b/src/main/webapp/templates/organismDetails.ftl
index d80e1327cd4e2fd76a8679457c10e8e674aa9cca..e13b02e2d2dc55d8d6ae1b7b063591ecdeaabb2f 100644
--- a/src/main/webapp/templates/organismDetails.ftl
+++ b/src/main/webapp/templates/organismDetails.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${organism.getLocalName(currentLocale.language)!""}<#if organism.tradeName?has_content> / ${organism.tradeName}</#if> (${organism.latinName!""})</title>
diff --git a/src/main/webapp/templates/organismForm.ftl b/src/main/webapp/templates/organismForm.ftl
index 478ef66d142a72586cef609b2fd4830b485dc414..4efc6c5829487ad82927b4ed6f8a58040815d570 100644
--- a/src/main/webapp/templates/organismForm.ftl
+++ b/src/main/webapp/templates/organismForm.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
diff --git a/src/main/webapp/templates/organismList.ftl b/src/main/webapp/templates/organismList.ftl
index ecfbc28370b567f327fc4d4a199de3a2de8c46a1..72afec290ca67eccb326cc991a43be9c57240892 100644
--- a/src/main/webapp/templates/organismList.ftl
+++ b/src/main/webapp/templates/organismList.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
diff --git a/src/main/webapp/templates/poi.ftl b/src/main/webapp/templates/poi.ftl
index 07df53d58335c8a0097ec224d2a8dd0376591839..bf61e8d5275ef2c948ff2967e436b11604b16e8f 100644
--- a/src/main/webapp/templates/poi.ftl
+++ b/src/main/webapp/templates/poi.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>POI</title>
diff --git a/src/main/webapp/templates/registerOpenIdForm.ftl b/src/main/webapp/templates/registerOpenIdForm.ftl
index e4df73104911e574bf15c6c5bf87303952961260..8ad8b4418ea82f4a756fcedc7bcd8b4408f58f6a 100644
--- a/src/main/webapp/templates/registerOpenIdForm.ftl
+++ b/src/main/webapp/templates/registerOpenIdForm.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.pleaselogin}</title>
diff --git a/src/main/webapp/templates/resetPasswordForm.ftl b/src/main/webapp/templates/resetPasswordForm.ftl
index 23136451e6e5a76785f0404dc18aeba5839ceedf..2429567b2a6ecb7b529ea715d50449af586540e4 100644
--- a/src/main/webapp/templates/resetPasswordForm.ftl
+++ b/src/main/webapp/templates/resetPasswordForm.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.resetPassword}</title>
diff --git a/src/main/webapp/templates/resetPasswordRequestForm.ftl b/src/main/webapp/templates/resetPasswordRequestForm.ftl
index b5fadb05bc25a3c56f2c00c431f1bdc0cb8547b2..25b79012bbcd048e99aca8d732ba6b1e4b2255c8 100644
--- a/src/main/webapp/templates/resetPasswordRequestForm.ftl
+++ b/src/main/webapp/templates/resetPasswordRequestForm.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.resetPasswordRequest}</title>
diff --git a/src/main/webapp/templates/runTaskManuallyForm.ftl b/src/main/webapp/templates/runTaskManuallyForm.ftl
index 674bf516e5b8f9834b9dd22e607eeb52b137ec24..21e42a3461fafdc01b3d66c3a8db727f70778b20 100644
--- a/src/main/webapp/templates/runTaskManuallyForm.ftl
+++ b/src/main/webapp/templates/runTaskManuallyForm.ftl
@@ -1,19 +1,19 @@
<#--
- Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
-
+ Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
diff --git a/src/main/webapp/templates/taskHistoryDetails.ftl b/src/main/webapp/templates/taskHistoryDetails.ftl
index c3b1543a1bd8d79977ca000b5f0214577bcdebc9..3ac331de90ea0dd4bf12d8eea10c1e5b09a810a9 100644
--- a/src/main/webapp/templates/taskHistoryDetails.ftl
+++ b/src/main/webapp/templates/taskHistoryDetails.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.taskHistoryDetails}</title>
diff --git a/src/main/webapp/templates/taskList.ftl b/src/main/webapp/templates/taskList.ftl
index 00b3a15e5fa2c676faea741c89ad8fc62ce20927..28cfff6662396d59782f0119b70bcc6d2645fe0e 100644
--- a/src/main/webapp/templates/taskList.ftl
+++ b/src/main/webapp/templates/taskList.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.tasks}</title>
diff --git a/src/main/webapp/templates/userForm.ftl b/src/main/webapp/templates/userForm.ftl
index 0ed02692b7bbbab2b05ff8a7b0974147991e131b..977b6ca3458a71113a98998a9909715609323ca8 100644
--- a/src/main/webapp/templates/userForm.ftl
+++ b/src/main/webapp/templates/userForm.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.user}</title>
diff --git a/src/main/webapp/templates/userList.ftl b/src/main/webapp/templates/userList.ftl
index c00bf36fb34266cf39ef525f36c2fde27dbd4517..f099792e8aafdf092ad39979c376c7f8c53f74e7 100644
--- a/src/main/webapp/templates/userList.ftl
+++ b/src/main/webapp/templates/userList.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.users}</title>
diff --git a/src/main/webapp/templates/userRegistrationForm.ftl b/src/main/webapp/templates/userRegistrationForm.ftl
index c9646d164dd9fdb4d1354bdfd9049d471835c54e..2e1ef8d324df34e9b0412ba34e1b9e9963ea69a0 100644
--- a/src/main/webapp/templates/userRegistrationForm.ftl
+++ b/src/main/webapp/templates/userRegistrationForm.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.registerNewUser}</title>
diff --git a/src/main/webapp/templates/weatherstationForm.ftl b/src/main/webapp/templates/weatherstationForm.ftl
index 9c5542b3256d28f77035889a7761f23757f368e4..ff7e17f5f6b2e66ff34c121f67f609cd7ca1aae3 100644
--- a/src/main/webapp/templates/weatherstationForm.ftl
+++ b/src/main/webapp/templates/weatherstationForm.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title><#if weatherStation.pointOfInterestId?has_content>${i18nBundle.editWeatherStation}<#else>${i18nBundle.newWeatherStation}</#if></title>
diff --git a/src/main/webapp/templates/weatherstationList.ftl b/src/main/webapp/templates/weatherstationList.ftl
index ba7f1a172dcc205060c4d0e73059eb563cdb6187..4e3b1a207dfd3387514d4373afef229172fbdedd 100644
--- a/src/main/webapp/templates/weatherstationList.ftl
+++ b/src/main/webapp/templates/weatherstationList.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${i18nBundle.weatherStations}</title>
diff --git a/src/main/webapp/templates/weatherstationView.ftl b/src/main/webapp/templates/weatherstationView.ftl
index 3aadd2a80e47a86de9f25c0203956428fdb84e5f..e457e83ca6910f4008548e6a748845fb7c08fafe 100644
--- a/src/main/webapp/templates/weatherstationView.ftl
+++ b/src/main/webapp/templates/weatherstationView.ftl
@@ -1,19 +1,19 @@
<#--
Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
-
+
This file is part of VIPSLogic.
VIPSLogic 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.
+
VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ Bioforsk Open Source License for more details.
+
+ You should have received a copy of the Bioforsk Open Source License
+ along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
--><#include "master.ftl">
<#macro page_head>
<title>${weatherStation.name}</title>
diff --git a/src/main/webapp/test/mock.kml b/src/main/webapp/test/mock.kml
index c0f316d0849638d9b5a70dd63b375e852709f953..d09df541f19ded40522bdd16b9eee4ecb6538d92 100644
--- a/src/main/webapp/test/mock.kml
+++ b/src/main/webapp/test/mock.kml
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
- *
- * This file is part of VIPSLogic.
- * VIPSLogic 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.
- *
- * VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * #
+ # Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ #
+ # This file is part of VIPSLogic.
+ # VIPSLogic 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.
+ #
+ # VIPSLogic 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 VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
+ #
*
*/
-->
diff --git a/src/test/java/no/bioforsk/vips/logic/forms/FormValidatorTest.java b/src/test/java/no/bioforsk/vips/logic/forms/FormValidatorTest.java
index cd2188c557adcb5deb1b460fadeeafde71f417e3..adfd9877295104ee093a01ac7f58c479cad715ce 100644
--- a/src/test/java/no/bioforsk/vips/logic/forms/FormValidatorTest.java
+++ b/src/test/java/no/bioforsk/vips/logic/forms/FormValidatorTest.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/test/java/no/bioforsk/vips/logic/forms/HTMLFormGeneratorTest.java b/src/test/java/no/bioforsk/vips/logic/forms/HTMLFormGeneratorTest.java
index b456de5b94ab9473c12716a83daa86f56d89976d..10061f740c6388c399a0be8368e58a86e5de249f 100644
--- a/src/test/java/no/bioforsk/vips/logic/forms/HTMLFormGeneratorTest.java
+++ b/src/test/java/no/bioforsk/vips/logic/forms/HTMLFormGeneratorTest.java
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2013 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/
diff --git a/src/test/java/no/bioforsk/vips/logic/session/UserBeanTest.java b/src/test/java/no/bioforsk/vips/logic/session/UserBeanTest.java
index 3ad7e84a6a95bbce0a47bc42e63ff81ec5d81eda..aabf88839c51750e295192b4d46f107ab4fb5906 100644
--- a/src/test/java/no/bioforsk/vips/logic/session/UserBeanTest.java
+++ b/src/test/java/no/bioforsk/vips/logic/session/UserBeanTest.java
@@ -3,17 +3,17 @@
*
* This file is part of VIPSLogic.
* VIPSLogic 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.
*
* VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>.
*
*/