From e3590ca11d6be337e176fc12b7f6a64f823ee1ad Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Wed, 15 Oct 2014 15:08:06 +0200
Subject: [PATCH] Changed License to Bioforsk Open Source License
---
nb-configuration.xml | 2 +-
.../vips/logic/VIPSLogicApplication.java | 14 ++++----
.../authenticate/AuthenticationFilter.java | 12 +++----
.../authenticate/OpenIdAuthAttributes.java | 12 +++----
.../authenticate/OpenIdRelyingParty.java | 12 +++----
.../PasswordValidationException.java | 12 +++----
.../ForecastConfigurationController.java | 12 +++----
.../servlet/FrontpageController.java | 12 +++----
.../controller/servlet/HttpErrorServlet.java | 12 +++----
.../controller/servlet/LoginController.java | 14 ++++----
.../controller/servlet/MessageController.java | 12 +++----
.../servlet/ObservationController.java | 12 +++----
.../servlet/OrganismController.java | 12 +++----
.../servlet/PointOfInterestController.java | 12 +++----
.../servlet/SchedulingController.java | 12 +++----
.../controller/servlet/TestFreemarker.java | 12 +++----
.../controller/servlet/UserController.java | 12 +++----
.../controller/session/ForecastBean.java | 16 ++++-----
.../logic/controller/session/MessageBean.java | 12 +++----
.../controller/session/ObservationBean.java | 12 +++----
.../controller/session/OrganismBean.java | 12 +++----
.../session/PointOfInterestBean.java | 12 +++----
.../controller/session/SchedulingBean.java | 12 +++----
.../logic/controller/session/UserBean.java | 12 +++----
.../bioforsk/vips/logic/entity/Country.java | 12 +++----
.../vips/logic/entity/ExternalResource.java | 14 ++++----
.../logic/entity/ExternalResourceType.java | 14 ++++----
.../logic/entity/ForecastConfiguration.java | 12 +++----
.../entity/ForecastModelConfiguration.java | 12 +++----
.../entity/ForecastModelConfigurationPK.java | 12 +++----
.../vips/logic/entity/ForecastResult.java | 14 ++++----
.../vips/logic/entity/HierarchyCategory.java | 12 +++----
.../logic/entity/HierarchyCategoryLocale.java | 12 +++----
.../entity/HierarchyCategoryLocalePK.java | 12 +++----
.../bioforsk/vips/logic/entity/Message.java | 12 +++----
.../logic/entity/MessageIllustration.java | 12 +++----
.../MessageIllustrationCaptionLocale.java | 12 +++----
.../MessageIllustrationCaptionLocalePK.java | 12 +++----
.../logic/entity/MessageIllustrationPK.java | 12 +++----
.../vips/logic/entity/MessageLocale.java | 12 +++----
.../vips/logic/entity/MessageLocalePK.java | 12 +++----
.../vips/logic/entity/MessageTag.java | 12 +++----
.../vips/logic/entity/MessageTagLocale.java | 12 +++----
.../vips/logic/entity/MessageTagLocalePK.java | 12 +++----
.../vips/logic/entity/ModelInformation.java | 12 +++----
.../vips/logic/entity/Observation.java | 12 +++----
.../vips/logic/entity/ObservationMethod.java | 12 +++----
.../bioforsk/vips/logic/entity/Organism.java | 15 ++++-----
.../entity/OrganismExternalResource.java | 12 +++----
.../entity/OrganismExternalResourcePK.java | 12 +++----
.../vips/logic/entity/OrganismLocale.java | 14 ++++----
.../vips/logic/entity/OrganismLocalePK.java | 15 ++++-----
.../vips/logic/entity/Organization.java | 12 +++----
.../vips/logic/entity/PointOfInterest.java | 14 ++++----
.../logic/entity/PointOfInterestType.java | 12 +++----
.../entity/PointOfInterestWeatherStation.java | 12 +++----
.../vips/logic/entity/TaskHistory.java | 14 ++++----
.../vips/logic/entity/TaskHistoryStatus.java | 14 ++++----
.../vips/logic/entity/UserAuthentication.java | 12 +++----
.../logic/entity/UserAuthenticationPK.java | 12 +++----
.../logic/entity/UserAuthenticationType.java | 12 +++----
.../logic/entity/UserPointOfInterest.java | 12 +++----
.../logic/entity/UserPointOfInterestPK.java | 12 +++----
.../vips/logic/entity/VipsLogicRole.java | 12 +++----
.../vips/logic/entity/VipsLogicUser.java | 12 +++----
.../entity/WeatherStationDataSource.java | 12 +++----
.../logic/entity/helpers/HstoreHelper.java | 12 +++----
.../logic/i18n/CharacterEncodingFilter.java | 12 +++----
.../vips/logic/i18n/LocalizationFilter.java | 14 ++++----
.../logic/i18n/ResourceBundleJSServlet.java | 14 ++++----
.../vips/logic/i18n/SessionLocaleUtil.java | 14 ++++----
.../vips/logic/scheduling/SchedulingTest.java | 12 +++----
.../vips/logic/scheduling/SchedulingUtil.java | 12 +++----
.../TaskLoggerSchedulerListener.java | 14 ++++----
.../TerminateSchedulerListener.java | 14 ++++----
.../scheduling/VIPSLogicTaskCollector.java | 12 +++----
.../vips/logic/scheduling/VipsLogicTask.java | 14 ++++----
.../scheduling/VipsLogicTaskFactory.java | 12 +++----
.../model/ModelRunPreprocessor.java | 12 +++----
.../model/ModelRunPreprocessorFactory.java | 14 ++++----
.../model/PreprocessorException.java | 14 ++++----
.../RunAppleScabModelForOrganizationTask.java | 12 +++----
.../AppleScabModelPreprocessor.java | 14 ++++----
.../NaerstadModelPreprocessor.java | 14 ++++----
.../RunAllForecastConfigurationsTask.java | 14 ++++----
.../tasks/UpdateModelInformationTask.java | 12 +++----
.../vips/logic/service/LogicService.java | 12 +++----
.../vips/logic/startup/StartupListener.java | 12 +++----
.../no/bioforsk/vips/logic/util/Globals.java | 12 +++----
.../util/HierarchyCategoryLocaleNames.java | 12 +++----
.../vips/logic/util/RunModelException.java | 12 +++----
.../logic/util/SessionControllerGetter.java | 12 +++----
.../vips/logic/util/SimpleMailSender.java | 12 +++----
.../bioforsk/vips/logic/util/StringUtils.java | 12 +++----
.../bioforsk/vips/logic/util/SystemTime.java | 12 +++----
.../java/no/bioforsk/web/forms/FormField.java | 14 ++++----
.../bioforsk/web/forms/FormSelectOption.java | 14 ++++----
.../java/no/bioforsk/web/forms/FormUtil.java | 12 +++----
.../no/bioforsk/web/forms/FormValidation.java | 12 +++----
.../web/forms/FormValidationException.java | 12 +++----
.../no/bioforsk/web/forms/FormValidator.java | 14 ++++----
.../bioforsk/web/forms/HTMLFormGenerator.java | 14 ++++----
src/main/resources/META-INF/persistence.xml | 31 +++++++++--------
.../vips/logic/i18n/vipslogictexts.properties | 31 ++++++++---------
.../logic/i18n/vipslogictexts_bs.properties | 33 ++++++++++---------
.../logic/i18n/vipslogictexts_hr.properties | 32 +++++++++---------
.../logic/i18n/vipslogictexts_nb.properties | 31 ++++++++---------
.../logic/i18n/vipslogictexts_sr.properties | 31 ++++++++---------
.../vips/logic/i18n/vtpassword.properties | 31 ++++++++---------
.../vips/logic/i18n/vtpassword_nb.properties | 31 ++++++++---------
src/main/resources/server.properties | 31 ++++++++---------
src/main/webapp/WEB-INF/jboss-web.xml | 32 +++++++++---------
src/main/webapp/WEB-INF/web.xml | 32 +++++++++---------
src/main/webapp/css/signin.css | 17 +++++-----
src/main/webapp/css/vipslogic.css | 18 +++++-----
.../forecastConfigurationForm.json | 30 ++++++++---------
.../webapp/formdefinitions/messageForm.json | 30 ++++++++---------
.../formdefinitions/models/APPLESCABM.json | 30 ++++++++---------
.../formdefinitions/models/NAERSTADMO.json | 30 ++++++++---------
.../formdefinitions/observationForm.json | 30 ++++++++---------
.../webapp/formdefinitions/organismForm.json | 30 ++++++++---------
.../formdefinitions/resetPasswordForm.json | 30 ++++++++---------
.../resetPasswordRequestForm.json | 30 ++++++++---------
.../formdefinitions/taskHistoryDateForm.json | 30 ++++++++---------
src/main/webapp/formdefinitions/userForm.json | 30 ++++++++---------
.../userRegistrationFormType1.json | 30 ++++++++---------
.../userRegistrationFormType2.json | 30 ++++++++---------
.../userRegistrationFormType3.json | 30 ++++++++---------
.../formdefinitions/weatherStationForm.json | 30 ++++++++---------
src/main/webapp/js/constants.js | 15 ++++-----
.../webapp/js/forecastConfigurationForm.js | 14 ++++----
src/main/webapp/js/observationFormMap.js | 14 ++++----
src/main/webapp/js/validateForm.js | 15 ++++-----
src/main/webapp/js/weatherStationFormMap.js | 14 ++++----
src/main/webapp/js/weatherStationListMap.js | 14 ++++----
src/main/webapp/js/weatherStationViewMap.js | 14 ++++----
src/main/webapp/templates/error_unknown.ftl | 19 ++++++-----
.../templates/forecastConfigurationForm.ftl | 20 +++++------
.../templates/forecastConfigurationList.ftl | 20 +++++------
src/main/webapp/templates/index.ftl | 20 +++++------
src/main/webapp/templates/login.ftl | 20 +++++------
src/main/webapp/templates/master.ftl | 20 +++++------
.../webapp/templates/master_errorpages.ftl | 20 +++++------
src/main/webapp/templates/messageForm.ftl | 20 +++++------
src/main/webapp/templates/messageList.ftl | 20 +++++------
src/main/webapp/templates/observationForm.ftl | 20 +++++------
src/main/webapp/templates/observationList.ftl | 18 +++++-----
src/main/webapp/templates/organism.ftl | 18 +++++-----
src/main/webapp/templates/organismDetails.ftl | 18 +++++-----
src/main/webapp/templates/organismForm.ftl | 18 +++++-----
src/main/webapp/templates/organismList.ftl | 18 +++++-----
src/main/webapp/templates/poi.ftl | 18 +++++-----
.../webapp/templates/registerOpenIdForm.ftl | 18 +++++-----
.../webapp/templates/resetPasswordForm.ftl | 18 +++++-----
.../templates/resetPasswordRequestForm.ftl | 18 +++++-----
.../webapp/templates/runTaskManuallyForm.ftl | 20 +++++------
.../webapp/templates/taskHistoryDetails.ftl | 18 +++++-----
src/main/webapp/templates/taskList.ftl | 18 +++++-----
src/main/webapp/templates/userForm.ftl | 18 +++++-----
src/main/webapp/templates/userList.ftl | 18 +++++-----
.../webapp/templates/userRegistrationForm.ftl | 18 +++++-----
.../webapp/templates/weatherstationForm.ftl | 18 +++++-----
.../webapp/templates/weatherstationList.ftl | 18 +++++-----
.../webapp/templates/weatherstationView.ftl | 18 +++++-----
src/main/webapp/test/mock.kml | 32 +++++++++---------
.../vips/logic/forms/FormValidatorTest.java | 12 +++----
.../logic/forms/HTMLFormGeneratorTest.java | 14 ++++----
.../vips/logic/session/UserBeanTest.java | 12 +++----
168 files changed, 1390 insertions(+), 1378 deletions(-)
diff --git a/nb-configuration.xml b/nb-configuration.xml
index bfe05d75..c8c1c51b 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 423abd7c..74b3d3ab 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 2223dc36..fa90ed87 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 a14f7205..3ccd99fb 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 20584f26..bdf36392 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 a05a3b3c..7beaba34 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 d9bd6dcf..f4f2cd2e 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 e534c950..572910bd 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 46ed5dea..b18b9ff2 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 e0052848..0e9644da 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 1d84bb29..825b28b3 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 2bc1d865..eabea7c0 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 6c0bc56c..30eff688 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 6f02174c..29949721 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 8ad491e8..7c373d38 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 088fad36..2c080aba 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 6c334d95..f4ff8257 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 d950c720..4a68c224 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 17985994..0b8580c8 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 4f6c143a..e6d8a0f7 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 2afecb38..17e9b579 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 d1e704f6..a6d45b60 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 500258f7..7976b658 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 7b39d43c..c4703dcc 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 1ed4cf11..2d0c3bfd 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 d766d6ce..c12d3485 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 fbe7aed1..fcb73325 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 e3db43c5..21c3547f 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 343cf2e4..a18a4d85 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 8f404502..a9737546 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 fc85e9b3..3202aacd 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 f3c737dd..96aa8289 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 84942351..bd9bfe88 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 8566fa16..c014f1c0 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 9a25608b..9892d68c 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 4d9a7042..3d25777d 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 232ccbf8..43f3d40d 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 7fbfdccd..4688a895 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 4eb51e4d..d9818020 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 2ba27516..5aca5ef9 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 827feaad..2066d0e6 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 b0fda8bf..3f9fd15b 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 4a5a9074..d0c476b6 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 fe43b033..a0992541 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 7ea6efbb..560d1722 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 cb123fec..368b14bd 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 d8ac2317..4565eab4 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 3ea50f35..f1733cae 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 8e82b7a2..194dc4f1 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 47771a50..72d444f8 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 69cd6197..ddac9da5 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 5b290fc2..21f66113 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 8c0c9ba3..45861711 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 619c60ed..65880f90 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 d3ac34b1..0b110523 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 7254b146..6146639a 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 8819d6e7..f382396f 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 457ae29a..d23a6813 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 c3d06a71..9eaaf415 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 f9b2e36e..c582d0e6 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 f854565c..470309b3 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 23587f20..5ac3ae1b 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 c1d95d6a..0c1187a9 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 af526dd3..965a5251 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 1a528ceb..6a02eae7 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 9aaac8f8..cf770004 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 d65e235a..1886664d 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 f30f234f..353c945f 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 60460031..1ad1f01b 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 f323e2bf..4eb17098 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 97c9d816..10118d90 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 92001f85..702cb0b4 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 a6a719d7..5a24a91a 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 fc84a665..fa3fc290 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 68146dbe..989f4956 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 f76a8797..dbd5372d 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 26318033..91cc8a28 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 ab4b55dd..62e1b703 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 83398da3..dbd49421 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 a51e0de3..7e4a0bbb 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 951bcbc9..e98ee62c 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 00a54705..3621ce6d 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 af89de60..1888cda6 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 2b587d82..1a5daefb 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 3554df48..5256923e 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 149d91c6..2c5ec20e 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 33bda241..cab2c343 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 1619516b..2e657b1e 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 df8c9710..b27a6351 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 6905fc2b..9df0ee91 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 61d7c7e1..e7372adf 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 7adbbaf3..8a158b17 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 8b6b1f68..7c4fb6b0 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 a708c1ee..d1b06301 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 56c35fb5..744da3d1 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 3ce34303..47ff7aee 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 09eaffbd..f787cac1 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 6171e6bc..ffe8bfb3 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 cc6225e1..5b030af6 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 16289cbe..e724bb8e 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 952068f4..54e732ce 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 d98a42eb..f4a3a2e1 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 c69b0e48..fa3961c0 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 3d1c46e5..9a7b1eb6 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 e301ad48..5b47a93f 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 e301ad48..1f4ff94c 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 c4210a42..ab8633bd 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 ef3c5112..4bd04da4 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 95c346ef..2bbe84b3 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 723d2f2a..3ace128d 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 e2daac3b..3bc70624 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 0194ff19..bc4f8d31 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 b840df02..460671e5 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 275d747b..0fc48932 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 4dcf6011..8ac3a9d8 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 7ee3060d..5e4fb918 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 76360532..6a50747a 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 ec90cabb..dbd88dd8 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 9b7dba1e..66d11a6e 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 01f16d57..1b9e54ba 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 21587be9..0b8f8056 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 d60d5000..1cf22922 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 a2f569cb..ce1dab78 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 c9b78149..283031df 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 c915765b..45d6f3ac 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 96adf5f8..4a8f0a87 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 047dce97..e8781011 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 aee00e1d..728d5e37 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 449fa851..12677391 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 7d7a94fc..ee8cfa89 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 ee09cb98..097db3f1 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 45ef0788..cb8fd39e 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 066d7603..ffbfd56f 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 37e436b7..f48f6de3 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 7491ab1a..1840fde7 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 c12c1625..8a79252c 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 0a96c638..dda15e84 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 3850b772..7f83caac 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 dbbcca36..896ef501 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 0d7edd52..2db19290 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 9c257df8..a4a263b5 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 91d3863b..070fee35 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 60b9ff6a..d0a4ae0b 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 6a082356..a74a3be5 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 09328797..5b98daaf 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 8b50245a..b21172f0 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 a8ff018e..a239e0e6 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 2acebd9c..f81d7fc1 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 d80e1327..e13b02e2 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 478ef66d..4efc6c58 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 ecfbc283..72afec29 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 07df53d5..bf61e8d5 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 e4df7310..8ad8b441 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 23136451..2429567b 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 b5fadb05..25b79012 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 674bf516..21e42a34 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 c3b1543a..3ac331de 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 00b3a15e..28cfff66 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 0ed02692..977b6ca3 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 c00bf36f..f099792e 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 c9646d16..2e1ef8d3 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 9c5542b3..ff7e17f5 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 ba7f1a17..4e3b1a20 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 3aadd2a8..e457e83c 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 c0f316d0..d09df541 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 cd2188c5..adfd9877 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 b456de5b..10061f74 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 3ad7e84a..aabf8883 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/>.
*
*/
--
GitLab