From 6904997757989f537dd515a882e5acd70bd3c1a5 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Wed, 17 Jan 2024 09:49:25 +0100 Subject: [PATCH] Update License header --- NIBIO_OPEN_SOURCE_LICENSE_1.05.txt | 618 ------------------ src/main/resources/META-INF/persistence.xml | 22 +- .../nibio/vips/logic/i18n/passay.properties | 20 +- .../vips/logic/i18n/passay_nb.properties | 20 +- .../vips/logic/i18n/passay_zh_CN.properties | 20 +- .../vips/logic/i18n/vipslogictexts.properties | 20 +- .../logic/i18n/vipslogictexts_bs.properties | 20 +- .../logic/i18n/vipslogictexts_hr.properties | 20 +- .../logic/i18n/vipslogictexts_nb.properties | 20 +- .../logic/i18n/vipslogictexts_sr.properties | 20 +- .../i18n/vipslogictexts_zh_CN.properties | 20 +- .../metnothredds/parametersources.properties | 24 +- src/main/resources/server.properties | 20 +- src/main/webapp/WEB-INF/jboss-web.xml | 21 +- src/main/webapp/WEB-INF/web.xml | 20 +- src/main/webapp/css/map.css | 18 +- src/main/webapp/css/signin.css | 18 +- src/main/webapp/css/vipslogic.css | 18 +- .../appleFruitMothStationForm.json | 24 +- .../formdefinitions/cropCategoryCropForm.json | 25 +- .../webapp/formdefinitions/cropPestForm.json | 25 +- .../forecastConfigurationForm.json | 25 +- .../forecastConfigurationMultipleNewForm.json | 25 +- .../webapp/formdefinitions/messageForm.json | 25 +- .../formdefinitions/models/ALTERNARIA.json | 25 +- .../formdefinitions/models/APPLESCABM.json | 25 +- .../formdefinitions/models/BREMIALACT.json | 25 +- .../formdefinitions/models/CYDIAPOMON.json | 25 +- .../formdefinitions/models/DELIARADIC.json | 25 +- .../formdefinitions/models/DELIARFOBO.json | 25 +- .../formdefinitions/models/DELIARFOBS.json | 25 +- .../formdefinitions/models/DELIARFOBY.json | 25 +- .../formdefinitions/models/DOWNCASTMO.json | 25 +- .../formdefinitions/models/FINNCEREAL.json | 25 +- .../formdefinitions/models/HOPLOCAMPA.json | 25 +- .../formdefinitions/models/LEAFBLOTCH.json | 25 +- .../formdefinitions/models/LYGUSRUGUL.json | 25 +- .../formdefinitions/models/MAMESTRABR.json | 25 +- .../formdefinitions/models/NAERSTADMO.json | 25 +- .../formdefinitions/models/NEGPROGMOD.json | 25 +- .../formdefinitions/models/PLASMOVITI.json | 25 +- .../formdefinitions/models/PSILAROBSE.json | 25 +- .../formdefinitions/models/PSILARTEMP.json | 25 +- .../formdefinitions/models/RAINYDAYSM.json | 25 +- .../formdefinitions/models/SEPAPIICOL.json | 25 +- .../formdefinitions/models/SEPTORIAHU.json | 25 +- .../formdefinitions/models/SEPTREFHUM.json | 25 +- .../formdefinitions/models/YSTEMBTEMP.json | 25 +- .../barkbeetle/seasonTrapsiteForm.json | 25 +- .../formdefinitions/observationForm.json | 25 +- .../formdefinitions/observationMapForm.json | 25 +- .../webapp/formdefinitions/organismForm.json | 25 +- .../formdefinitions/organizationForm.json | 25 +- .../organizationGroupForm.json | 25 +- src/main/webapp/formdefinitions/poiForm.json | 25 +- .../formdefinitions/resetPasswordForm.json | 25 +- .../resetPasswordRequestForm.json | 25 +- .../formdefinitions/taskHistoryDateForm.json | 25 +- src/main/webapp/formdefinitions/userForm.json | 26 +- .../userRegistrationFormType1.json | 25 +- .../userRegistrationFormType2.json | 25 +- .../userRegistrationFormType3.json | 25 +- .../formdefinitions/weatherStationForm.json | 25 +- .../js/appleFruitMothObservationSiteMap.js | 18 +- .../js/appleFruitMothObservationSitesMap.js | 18 +- src/main/webapp/js/constants.js | 18 +- .../webapp/js/forecastConfigurationForm.js | 18 +- .../barkbeetle/seasonTrapsiteFormMap.js | 18 +- .../barkbeetle/seasonTrapsiteListMap.js | 18 +- src/main/webapp/js/objectGISInfoMap.js | 18 +- src/main/webapp/js/observationDataHandler.js | 18 +- src/main/webapp/js/observationMap.js | 18 +- src/main/webapp/js/poiFormMap.js | 18 +- src/main/webapp/js/poiListMap.js | 18 +- src/main/webapp/js/util.js | 18 +- src/main/webapp/js/validateForm.js | 18 +- src/main/webapp/js/weatherStationFormMap.js | 18 +- src/main/webapp/js/weatherStationListMap.js | 19 +- src/main/webapp/js/weatherStationViewMap.js | 18 +- .../nordic_septoria_map.css | 17 +- .../nordic_septoria_map.js | 18 +- .../nordic_septoria_whs.css | 17 +- .../nordic_septoria_whs.js | 18 +- .../templates/appleFruitMothClusterForm.ftl | 24 +- .../templates/appleFruitMothStationForm.ftl | 24 +- .../templates/appleFruitMothStationList.ftl | 24 +- .../webapp/templates/cropCategoryList.ftl | 24 +- src/main/webapp/templates/cropList.ftl | 24 +- src/main/webapp/templates/cropPestForm.ftl | 24 +- src/main/webapp/templates/error_unknown.ftl | 24 +- .../templates/forecastConfigurationForm.ftl | 24 +- .../templates/forecastConfigurationList.ftl | 24 +- src/main/webapp/templates/index.ftl | 24 +- src/main/webapp/templates/login.ftl | 24 +- src/main/webapp/templates/master.ftl | 24 +- .../webapp/templates/master_errorpages.ftl | 24 +- src/main/webapp/templates/messageForm.ftl | 24 +- src/main/webapp/templates/messageList.ftl | 24 +- .../barkbeetleSeasonTrapsiteCandidateList.ftl | 24 +- .../barkbeetleSeasonTrapsiteDeleteForm.ftl | 24 +- .../barkbeetleSeasonTrapsiteForm.ftl | 24 +- .../barkbeetleSeasonTrapsiteList.ftl | 24 +- ...arkbeetleSeasonTrapsiteMaintenanceList.ftl | 24 +- .../barkbeetleSeasonTrapsitesStatus.ftl | 24 +- .../barkbeetleTimeseriesCalculation.ftl | 24 +- .../barkbeetleTrapsiteRegistrationForm.ftl | 24 +- .../notificationSubscriptionForm.ftl | 24 +- src/main/webapp/templates/observationForm.ftl | 24 +- src/main/webapp/templates/observationList.ftl | 24 +- src/main/webapp/templates/observationMap.ftl | 24 +- src/main/webapp/templates/organism.ftl | 20 +- src/main/webapp/templates/organismDetails.ftl | 20 +- src/main/webapp/templates/organismForm.ftl | 20 +- src/main/webapp/templates/organismList.ftl | 20 +- .../webapp/templates/organizationForm.ftl | 20 +- .../templates/organizationGroupForm.ftl | 20 +- .../templates/organizationGroupList.ftl | 20 +- .../webapp/templates/organizationList.ftl | 20 +- src/main/webapp/templates/pestList.ftl | 20 +- src/main/webapp/templates/poi.ftl | 20 +- .../webapp/templates/poiDeletePreview.ftl | 20 +- src/main/webapp/templates/poiForm.ftl | 20 +- src/main/webapp/templates/poiList.ftl | 21 +- .../webapp/templates/registerOpenIdForm.ftl | 20 +- .../webapp/templates/resetPasswordForm.ftl | 20 +- .../templates/resetPasswordRequestForm.ftl | 20 +- .../webapp/templates/runTaskManuallyForm.ftl | 20 +- .../webapp/templates/taskHistoryDetails.ftl | 21 +- src/main/webapp/templates/taskList.ftl | 21 +- src/main/webapp/templates/userDeleteForm.ftl | 20 +- src/main/webapp/templates/userForm.ftl | 20 +- src/main/webapp/templates/userList.ftl | 20 +- .../templates/userOrganizationGroupsList.ftl | 20 +- .../webapp/templates/userRegistrationForm.ftl | 20 +- .../templates/weatherstationDeletePreview.ftl | 20 +- .../webapp/templates/weatherstationForm.ftl | 20 +- .../webapp/templates/weatherstationList.ftl | 20 +- .../webapp/templates/weatherstationView.ftl | 20 +- src/main/webapp/test/mock.kml | 21 +- 139 files changed, 1547 insertions(+), 2128 deletions(-) delete mode 100755 NIBIO_OPEN_SOURCE_LICENSE_1.05.txt diff --git a/NIBIO_OPEN_SOURCE_LICENSE_1.05.txt b/NIBIO_OPEN_SOURCE_LICENSE_1.05.txt deleted file mode 100755 index 98f5ab00..00000000 --- a/NIBIO_OPEN_SOURCE_LICENSE_1.05.txt +++ /dev/null @@ -1,618 +0,0 @@ - NIBIO OPEN SOURCE LICENSE V.1.0 (2015) - - PREAMBLE AND ADDITIONAL TERMS - - The original licensor is the Norwegian Institute for Agricultural and -Environmental Research, registered in Norway with registration number 988 983 -837, and business address NO-1430 ÅS, NORWAY, hereafter referred to as -"NIBIO". - - This NIBIO OPEN SOURCE LICENSE V.1.0 (2015), in short the NIBIO Open -Source License, is based on the GNU Affero General Public License, version 3. -All of the terms and conditions of the GNU Affero General Public License, -version 3, have been set out below, save the below mentioned additional -prevailing terms that have priority over the terms otherwise identical to the -GNU Affero General Public License, version 3, and that Section 0 ("This -License" definition changed), 13 ("version 3 of the GNU General Public License" -replaced by "this License") and 14 ("The Free Software Foundation" replaced by -"NIBIO" and "GNU Affero General Public License" replaced by "License") have -been adjusted as a consequence of this. - - ADDITONAL PREVAILING TERMS - - (a) The NIBIO Open Source License regulates the NIBIO VIPS Platform -software, an Internet based system enabling prediction of infection risk of -plant diseases, pests and weeds. The NIBIO Open Source License DOES NOT -INCLUDE the specific forecasting models, neither their algorithms nor their -implementation to be used by the NIBIO VIPS Platform. You are free to -implement any other forecasting model to be used by the NIBIO VIPS Platform, -regardless of license terms at your own responsibility. - - (b) This license is governed by Norwegian law, as far as any party or third -party purports or sets forward any claim towards NIBIO. Any claims towards -NIBIO shall be solved by the exclusive venue of Oslo City Courts, Norway. -This paragraph is not applicable for claims only between any later parties to -this license. - - (c) By entering into this agreement you also agree to indemnify NIBIO and -its employees / consultants / board, for any claims of liability related to -this license set forward by yourself or any party deviating its rights from you. - - (d) You shall include the following in the start of each source file: - - Copyright (c) <year> <name of author> - - This file is part of <application name>. <application name> is free - software: you can redistribute it and/or modify it under the terms of - the NIBIO Open Source License as published by NIBIO, either - version 1 of the License, or (at your option) any later version. - - <application name> is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with <application name>. If not, see - <http://www.nibio.no/licenses/>. - - It is also recommended that you add information on how to contact you by - electronic and paper mail. - - 1. TERMS AND CONDITIONS - - 2. 0. Definitions. - - "This License" refers to NIBIO Open Source License v.1.0 (2015). - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 3. 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 4. 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 5. 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 6. 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 7. 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 8. 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 9. 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 10. 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 11. 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 12. 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 13. 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 14. 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 15. 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by This License -that is incorporated pursuant to the following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 16. 14. Revised Versions of this License. - - NIBIO may publish revised and/or new versions of the License from time to -time. Such new versions will be similar in spirit to the present version, but -may differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the License "or any later -version" applies to it, you have the option of following the terms and -conditions either of that numbered version or of any later version published by -NIBIO. If the Program does not specify a version number of the License, you -may choose any version ever published by the NIBIO. - - If the Program specifies that a proxy can decide which future -versions of the License can be used, that proxy's public statement of -acceptance of a version permanently authorizes you to choose that version for -the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 17. 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 18. 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 19. 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index bfaf5ef4..3c40ebdc 100755 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -3,21 +3,19 @@ # # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # - # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://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/nibio/vips/logic/i18n/passay.properties b/src/main/resources/no/nibio/vips/logic/i18n/passay.properties index 5d364fe6..423ece40 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/passay.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/passay.properties @@ -2,18 +2,18 @@ # Copyright (c) 2016 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # # This (and and corresponding localized) property file(s) diff --git a/src/main/resources/no/nibio/vips/logic/i18n/passay_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/passay_nb.properties index 128eefb6..9dc5899c 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/passay_nb.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/passay_nb.properties @@ -2,18 +2,18 @@ # Copyright (c) 2016 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # # This (and and corresponding localized) property file(s) diff --git a/src/main/resources/no/nibio/vips/logic/i18n/passay_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/passay_zh_CN.properties index 9f1656df..a09c9a93 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/passay_zh_CN.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/passay_zh_CN.properties @@ -2,18 +2,18 @@ # Copyright (c) 2016 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # # This (and and corresponding localized) property file(s) diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties index 947d27d1..9242c667 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties @@ -3,18 +3,18 @@ # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # ALTERNARIA = Alternaria Model diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties index fe09b88c..77a55a05 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties @@ -2,18 +2,18 @@ # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # isPositiveRegistration=Pest presence confirmed ALTERNARIA = Alternaria Model diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties index ebcccfcd..7bf587e1 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties @@ -2,18 +2,18 @@ # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # isPositiveRegistration=Pest presence confirmed ALTERNARIA = Alternaria Model diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties index 2e80c64e..3d61ce6d 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties @@ -2,18 +2,18 @@ # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # isPositiveRegistration=Skadegj\u00f8rer p\u00e5vist ALTERNARIA = Alternariamodell diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties index a431e5ec..3f9f7573 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties @@ -2,18 +2,18 @@ # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # isPositiveRegistration=Pest presence confirmed ALTERNARIA = Alternaria Model diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties index 27b71513..3676563e 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties @@ -2,18 +2,18 @@ # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # isPositiveRegistration=Pest presence confirmed ALTERNARIA = Alternaria Model diff --git a/src/main/resources/no/nibio/vips/util/weather/metnothredds/parametersources.properties b/src/main/resources/no/nibio/vips/util/weather/metnothredds/parametersources.properties index 5707d828..5269bcd1 100644 --- a/src/main/resources/no/nibio/vips/util/weather/metnothredds/parametersources.properties +++ b/src/main/resources/no/nibio/vips/util/weather/metnothredds/parametersources.properties @@ -1,18 +1,18 @@ # Copyright (c) 2017 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. -# VIPSLogic is free software: you can redistribute it and/or modify -# it under the terms of the NIBIO Open Source License as published by -# NIBIO, either version 1 of the License, or (at your option) any -# later version. -# -# VIPSLogic is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# NIBIO Open Source License for more details. -# -# You should have received a copy of the NIBIO Open Source License -# along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. +# This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. # TM=air_temperature_2m TX=air_temperature_max diff --git a/src/main/resources/server.properties b/src/main/resources/server.properties index 8691b9a2..e1e68614 100755 --- a/src/main/resources/server.properties +++ b/src/main/resources/server.properties @@ -2,16 +2,16 @@ # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, +# This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml index 5b0877cd..e53e1472 100755 --- a/src/main/webapp/WEB-INF/jboss-web.xml +++ b/src/main/webapp/WEB-INF/jboss-web.xml @@ -3,19 +3,18 @@ # # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # - # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # --> <jboss-web> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 39d9ae91..62d85f54 100755 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -4,18 +4,18 @@ # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/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"> diff --git a/src/main/webapp/css/map.css b/src/main/webapp/css/map.css index 735c709a..ab79fea3 100755 --- a/src/main/webapp/css/map.css +++ b/src/main/webapp/css/map.css @@ -2,18 +2,18 @@ * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ /* diff --git a/src/main/webapp/css/signin.css b/src/main/webapp/css/signin.css index 96a71743..3762ccb4 100755 --- a/src/main/webapp/css/signin.css +++ b/src/main/webapp/css/signin.css @@ -2,18 +2,18 @@ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/css/vipslogic.css b/src/main/webapp/css/vipslogic.css index 372c4365..d0838304 100755 --- a/src/main/webapp/css/vipslogic.css +++ b/src/main/webapp/css/vipslogic.css @@ -2,18 +2,18 @@ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ /* diff --git a/src/main/webapp/formdefinitions/appleFruitMothStationForm.json b/src/main/webapp/formdefinitions/appleFruitMothStationForm.json index cec171ad..cf7ca381 100755 --- a/src/main/webapp/formdefinitions/appleFruitMothStationForm.json +++ b/src/main/webapp/formdefinitions/appleFruitMothStationForm.json @@ -3,18 +3,18 @@ "Copyright (c) 2014-2018 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the appleFruitMothStationForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/cropCategoryCropForm.json b/src/main/webapp/formdefinitions/cropCategoryCropForm.json index 621429ac..ec641b5f 100755 --- a/src/main/webapp/formdefinitions/cropCategoryCropForm.json +++ b/src/main/webapp/formdefinitions/cropCategoryCropForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the organismForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/cropPestForm.json b/src/main/webapp/formdefinitions/cropPestForm.json index c2eb651c..cc91c3cd 100755 --- a/src/main/webapp/formdefinitions/cropPestForm.json +++ b/src/main/webapp/formdefinitions/cropPestForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the organismForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/forecastConfigurationForm.json b/src/main/webapp/formdefinitions/forecastConfigurationForm.json index 0273d045..95c43c59 100755 --- a/src/main/webapp/formdefinitions/forecastConfigurationForm.json +++ b/src/main/webapp/formdefinitions/forecastConfigurationForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the forecastConfigurationForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/forecastConfigurationMultipleNewForm.json b/src/main/webapp/formdefinitions/forecastConfigurationMultipleNewForm.json index a39766e8..b3e2b1fa 100755 --- a/src/main/webapp/formdefinitions/forecastConfigurationMultipleNewForm.json +++ b/src/main/webapp/formdefinitions/forecastConfigurationMultipleNewForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the forecastConfigurationMultipleNewForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/messageForm.json b/src/main/webapp/formdefinitions/messageForm.json index 5e7b86b9..cc261e33 100755 --- a/src/main/webapp/formdefinitions/messageForm.json +++ b/src/main/webapp/formdefinitions/messageForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the organismForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/ALTERNARIA.json b/src/main/webapp/formdefinitions/models/ALTERNARIA.json index f65768d9..95efe7e5 100644 --- a/src/main/webapp/formdefinitions/models/ALTERNARIA.json +++ b/src/main/webapp/formdefinitions/models/ALTERNARIA.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for ALTERNARIA", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/APPLESCABM.json b/src/main/webapp/formdefinitions/models/APPLESCABM.json index c087e0cf..ebf0634f 100755 --- a/src/main/webapp/formdefinitions/models/APPLESCABM.json +++ b/src/main/webapp/formdefinitions/models/APPLESCABM.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for APPLESCABM", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/BREMIALACT.json b/src/main/webapp/formdefinitions/models/BREMIALACT.json index e0de5760..cd24e726 100755 --- a/src/main/webapp/formdefinitions/models/BREMIALACT.json +++ b/src/main/webapp/formdefinitions/models/BREMIALACT.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for BREMIALACT", "fields": [] diff --git a/src/main/webapp/formdefinitions/models/CYDIAPOMON.json b/src/main/webapp/formdefinitions/models/CYDIAPOMON.json index 894f9e46..8287d4e5 100755 --- a/src/main/webapp/formdefinitions/models/CYDIAPOMON.json +++ b/src/main/webapp/formdefinitions/models/CYDIAPOMON.json @@ -3,18 +3,19 @@ "Copyright (c) 2015 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for CYDIAPOMON (Cydia Pomonella model)", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/DELIARADIC.json b/src/main/webapp/formdefinitions/models/DELIARADIC.json index 8f083291..4053e2e4 100755 --- a/src/main/webapp/formdefinitions/models/DELIARADIC.json +++ b/src/main/webapp/formdefinitions/models/DELIARADIC.json @@ -3,18 +3,19 @@ "Copyright (c) 2015 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for DELIARADIC", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/DELIARFOBO.json b/src/main/webapp/formdefinitions/models/DELIARFOBO.json index 6ac4bdcb..b7c9a74c 100755 --- a/src/main/webapp/formdefinitions/models/DELIARFOBO.json +++ b/src/main/webapp/formdefinitions/models/DELIARFOBO.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for DELIARFOBS", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/DELIARFOBS.json b/src/main/webapp/formdefinitions/models/DELIARFOBS.json index 1403be2e..0e2ea6e4 100755 --- a/src/main/webapp/formdefinitions/models/DELIARFOBS.json +++ b/src/main/webapp/formdefinitions/models/DELIARFOBS.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for DELIARFOBS", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/DELIARFOBY.json b/src/main/webapp/formdefinitions/models/DELIARFOBY.json index 6ac4bdcb..b7c9a74c 100755 --- a/src/main/webapp/formdefinitions/models/DELIARFOBY.json +++ b/src/main/webapp/formdefinitions/models/DELIARFOBY.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for DELIARFOBS", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/DOWNCASTMO.json b/src/main/webapp/formdefinitions/models/DOWNCASTMO.json index 195062a7..fbf19af2 100755 --- a/src/main/webapp/formdefinitions/models/DOWNCASTMO.json +++ b/src/main/webapp/formdefinitions/models/DOWNCASTMO.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for DOWNCASTMO", "fields": [] diff --git a/src/main/webapp/formdefinitions/models/FINNCEREAL.json b/src/main/webapp/formdefinitions/models/FINNCEREAL.json index a8b79836..9a1e2f5f 100644 --- a/src/main/webapp/formdefinitions/models/FINNCEREAL.json +++ b/src/main/webapp/formdefinitions/models/FINNCEREAL.json @@ -3,18 +3,19 @@ "Copyright (c) 2018 NIBIO <http://www.nibio.nb/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.nb/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Sowing date, previous crop, tillage method, and current crop disease susceptibility for the specific field", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/HOPLOCAMPA.json b/src/main/webapp/formdefinitions/models/HOPLOCAMPA.json index 67df9b20..27fcdf69 100755 --- a/src/main/webapp/formdefinitions/models/HOPLOCAMPA.json +++ b/src/main/webapp/formdefinitions/models/HOPLOCAMPA.json @@ -3,18 +3,19 @@ "Copyright (c) 2015 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for HOPLOCAMPA", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/LEAFBLOTCH.json b/src/main/webapp/formdefinitions/models/LEAFBLOTCH.json index 2fc42b68..cfe845a0 100644 --- a/src/main/webapp/formdefinitions/models/LEAFBLOTCH.json +++ b/src/main/webapp/formdefinitions/models/LEAFBLOTCH.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for LEAFBLOTCH", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/LYGUSRUGUL.json b/src/main/webapp/formdefinitions/models/LYGUSRUGUL.json index 2e76ad6d..3d8857dc 100755 --- a/src/main/webapp/formdefinitions/models/LYGUSRUGUL.json +++ b/src/main/webapp/formdefinitions/models/LYGUSRUGUL.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for LYGUSRUGUL", "fields": [] diff --git a/src/main/webapp/formdefinitions/models/MAMESTRABR.json b/src/main/webapp/formdefinitions/models/MAMESTRABR.json index a05d85da..f0d24fe3 100755 --- a/src/main/webapp/formdefinitions/models/MAMESTRABR.json +++ b/src/main/webapp/formdefinitions/models/MAMESTRABR.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for MAMESTRABR", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/NAERSTADMO.json b/src/main/webapp/formdefinitions/models/NAERSTADMO.json index ed54bdb5..b0e827d4 100755 --- a/src/main/webapp/formdefinitions/models/NAERSTADMO.json +++ b/src/main/webapp/formdefinitions/models/NAERSTADMO.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for NAERSTADMO", "fields": [] diff --git a/src/main/webapp/formdefinitions/models/NEGPROGMOD.json b/src/main/webapp/formdefinitions/models/NEGPROGMOD.json index 4f148888..c2be39ae 100755 --- a/src/main/webapp/formdefinitions/models/NEGPROGMOD.json +++ b/src/main/webapp/formdefinitions/models/NEGPROGMOD.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for NEGPROGMOD", "fields": [] diff --git a/src/main/webapp/formdefinitions/models/PLASMOVITI.json b/src/main/webapp/formdefinitions/models/PLASMOVITI.json index d2c25154..82fcbe70 100755 --- a/src/main/webapp/formdefinitions/models/PLASMOVITI.json +++ b/src/main/webapp/formdefinitions/models/PLASMOVITI.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for PLASMOVITI", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/PSILAROBSE.json b/src/main/webapp/formdefinitions/models/PSILAROBSE.json index 7c94af31..2de41ab0 100755 --- a/src/main/webapp/formdefinitions/models/PSILAROBSE.json +++ b/src/main/webapp/formdefinitions/models/PSILAROBSE.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for PSILAROBSE", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/PSILARTEMP.json b/src/main/webapp/formdefinitions/models/PSILARTEMP.json index f30421fd..ba30bd68 100755 --- a/src/main/webapp/formdefinitions/models/PSILARTEMP.json +++ b/src/main/webapp/formdefinitions/models/PSILARTEMP.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for PSILARTEMP", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/RAINYDAYSM.json b/src/main/webapp/formdefinitions/models/RAINYDAYSM.json index 55341a1d..35ff2bb2 100644 --- a/src/main/webapp/formdefinitions/models/RAINYDAYSM.json +++ b/src/main/webapp/formdefinitions/models/RAINYDAYSM.json @@ -3,18 +3,19 @@ "Copyright (c) 2019 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for RAINYDAYSM", "fields": [{ diff --git a/src/main/webapp/formdefinitions/models/SEPAPIICOL.json b/src/main/webapp/formdefinitions/models/SEPAPIICOL.json index 684587c1..0514d3de 100755 --- a/src/main/webapp/formdefinitions/models/SEPAPIICOL.json +++ b/src/main/webapp/formdefinitions/models/SEPAPIICOL.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for SEPAPIICOL", "fields": [] diff --git a/src/main/webapp/formdefinitions/models/SEPTORIAHU.json b/src/main/webapp/formdefinitions/models/SEPTORIAHU.json index b5c3916d..f1917c53 100644 --- a/src/main/webapp/formdefinitions/models/SEPTORIAHU.json +++ b/src/main/webapp/formdefinitions/models/SEPTORIAHU.json @@ -3,18 +3,19 @@ "Copyright (c) 2019 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for SEPTORIAHU", "fields": [ diff --git a/src/main/webapp/formdefinitions/models/SEPTREFHUM.json b/src/main/webapp/formdefinitions/models/SEPTREFHUM.json index 94cba116..f7a8cbc1 100644 --- a/src/main/webapp/formdefinitions/models/SEPTREFHUM.json +++ b/src/main/webapp/formdefinitions/models/SEPTREFHUM.json @@ -3,18 +3,19 @@ "Copyright (c) 2019 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for SEPTREFHUM", "fields": [{ diff --git a/src/main/webapp/formdefinitions/models/YSTEMBTEMP.json b/src/main/webapp/formdefinitions/models/YSTEMBTEMP.json index b091e01c..882a2bcc 100644 --- a/src/main/webapp/formdefinitions/models/YSTEMBTEMP.json +++ b/src/main/webapp/formdefinitions/models/YSTEMBTEMP.json @@ -3,18 +3,19 @@ "Copyright (c) 2022 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the specific fields for YSTEMBTEMP", "fields": [ diff --git a/src/main/webapp/formdefinitions/modules/barkbeetle/seasonTrapsiteForm.json b/src/main/webapp/formdefinitions/modules/barkbeetle/seasonTrapsiteForm.json index ebd0ec05..57cba741 100644 --- a/src/main/webapp/formdefinitions/modules/barkbeetle/seasonTrapsiteForm.json +++ b/src/main/webapp/formdefinitions/modules/barkbeetle/seasonTrapsiteForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2020 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the seasonTrapsiteForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/observationForm.json b/src/main/webapp/formdefinitions/observationForm.json index d559d505..d55a16ba 100755 --- a/src/main/webapp/formdefinitions/observationForm.json +++ b/src/main/webapp/formdefinitions/observationForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the observationForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/observationMapForm.json b/src/main/webapp/formdefinitions/observationMapForm.json index 77149662..ae6027c3 100755 --- a/src/main/webapp/formdefinitions/observationMapForm.json +++ b/src/main/webapp/formdefinitions/observationMapForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Simplify input check for observation map", "fields": [ diff --git a/src/main/webapp/formdefinitions/organismForm.json b/src/main/webapp/formdefinitions/organismForm.json index 48c7c5bc..8395e8fc 100755 --- a/src/main/webapp/formdefinitions/organismForm.json +++ b/src/main/webapp/formdefinitions/organismForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the organismForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/organizationForm.json b/src/main/webapp/formdefinitions/organizationForm.json index cf1de256..acc63d9e 100644 --- a/src/main/webapp/formdefinitions/organizationForm.json +++ b/src/main/webapp/formdefinitions/organizationForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2019 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the organizationForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/organizationGroupForm.json b/src/main/webapp/formdefinitions/organizationGroupForm.json index 3308d175..66ddb20e 100755 --- a/src/main/webapp/formdefinitions/organizationGroupForm.json +++ b/src/main/webapp/formdefinitions/organizationGroupForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the poiForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/poiForm.json b/src/main/webapp/formdefinitions/poiForm.json index fbb1808a..6aa6e956 100755 --- a/src/main/webapp/formdefinitions/poiForm.json +++ b/src/main/webapp/formdefinitions/poiForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the poiForm and how to validate it", "fields": [ diff --git a/src/main/webapp/formdefinitions/resetPasswordForm.json b/src/main/webapp/formdefinitions/resetPasswordForm.json index 024d351b..52486af5 100755 --- a/src/main/webapp/formdefinitions/resetPasswordForm.json +++ b/src/main/webapp/formdefinitions/resetPasswordForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 ded4cc32..ae2d963d 100755 --- a/src/main/webapp/formdefinitions/resetPasswordRequestForm.json +++ b/src/main/webapp/formdefinitions/resetPasswordRequestForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 2f9f8ac1..3f89913a 100755 --- a/src/main/webapp/formdefinitions/taskHistoryDateForm.json +++ b/src/main/webapp/formdefinitions/taskHistoryDateForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 93cf962a..f727874a 100755 --- a/src/main/webapp/formdefinitions/userForm.json +++ b/src/main/webapp/formdefinitions/userForm.json @@ -2,19 +2,19 @@ "_licenseNote": [ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", - "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 04f7d313..4ab7675e 100755 --- a/src/main/webapp/formdefinitions/userRegistrationFormType1.json +++ b/src/main/webapp/formdefinitions/userRegistrationFormType1.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 2a1f9fb4..e658e4e0 100755 --- a/src/main/webapp/formdefinitions/userRegistrationFormType2.json +++ b/src/main/webapp/formdefinitions/userRegistrationFormType2.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 3b440229..27c0f5ca 100755 --- a/src/main/webapp/formdefinitions/userRegistrationFormType3.json +++ b/src/main/webapp/formdefinitions/userRegistrationFormType3.json @@ -3,18 +3,19 @@ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 1bc2f92b..c4540a52 100755 --- a/src/main/webapp/formdefinitions/weatherStationForm.json +++ b/src/main/webapp/formdefinitions/weatherStationForm.json @@ -3,18 +3,19 @@ "Copyright (c) 2014-2015 NIBIO <http://www.nibio.no/>. ", "", "This file is part of VIPSLogic. ", - "VIPSLogic is free software: you can redistribute it and/or modify ", - "it under the terms of the NIBIO Open Source License as published by ", - "NIBIO, either version 1 of the License, or (at your option) any ", - "later version. ", - "", - "VIPSLogic is distributed in the hope that it will be useful, ", - "but WITHOUT ANY WARRANTY; without even the implied warranty of ", - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ", - "NIBIO Open Source License for more details. ", - "", - "You should have received a copy of the NIBIO Open Source License ", - "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. " + + "This program is free software: you can redistribute it and/or modify", + "it under the terms of the GNU Affero General Public License as published by", + "the Free Software Foundation, either version 3 of the License, or", + "(at your option) any later version.", + + "This program is distributed in the hope that it will be useful,", + "but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>." ], "_comment" : "Structure of the weatherStationForm and how to validate it", "fields": [ diff --git a/src/main/webapp/js/appleFruitMothObservationSiteMap.js b/src/main/webapp/js/appleFruitMothObservationSiteMap.js index d859edea..66435556 100755 --- a/src/main/webapp/js/appleFruitMothObservationSiteMap.js +++ b/src/main/webapp/js/appleFruitMothObservationSiteMap.js @@ -2,18 +2,18 @@ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/appleFruitMothObservationSitesMap.js b/src/main/webapp/js/appleFruitMothObservationSitesMap.js index d6675744..4502cfcd 100755 --- a/src/main/webapp/js/appleFruitMothObservationSitesMap.js +++ b/src/main/webapp/js/appleFruitMothObservationSitesMap.js @@ -2,18 +2,18 @@ * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/constants.js b/src/main/webapp/js/constants.js index ebcf5c32..fe1615be 100755 --- a/src/main/webapp/js/constants.js +++ b/src/main/webapp/js/constants.js @@ -2,18 +2,18 @@ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/forecastConfigurationForm.js b/src/main/webapp/js/forecastConfigurationForm.js index 12ce726e..12b45512 100755 --- a/src/main/webapp/js/forecastConfigurationForm.js +++ b/src/main/webapp/js/forecastConfigurationForm.js @@ -2,18 +2,18 @@ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteFormMap.js b/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteFormMap.js index 27fa3517..331e0b72 100644 --- a/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteFormMap.js +++ b/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteFormMap.js @@ -2,18 +2,18 @@ * Copyright (c) 2020 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteListMap.js b/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteListMap.js index 45f18f61..43f44a89 100644 --- a/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteListMap.js +++ b/src/main/webapp/js/modules/barkbeetle/seasonTrapsiteListMap.js @@ -2,18 +2,18 @@ * Copyright (c) 2020 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/objectGISInfoMap.js b/src/main/webapp/js/objectGISInfoMap.js index 895b37f5..7aa33f4a 100755 --- a/src/main/webapp/js/objectGISInfoMap.js +++ b/src/main/webapp/js/objectGISInfoMap.js @@ -2,18 +2,18 @@ * Copyright (c) 2015-2016 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. - * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/observationDataHandler.js b/src/main/webapp/js/observationDataHandler.js index 7380cc9e..6292a567 100755 --- a/src/main/webapp/js/observationDataHandler.js +++ b/src/main/webapp/js/observationDataHandler.js @@ -2,18 +2,18 @@ * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/observationMap.js b/src/main/webapp/js/observationMap.js index fa6cd64a..e5675202 100755 --- a/src/main/webapp/js/observationMap.js +++ b/src/main/webapp/js/observationMap.js @@ -2,18 +2,18 @@ * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/poiFormMap.js b/src/main/webapp/js/poiFormMap.js index 10ea2c94..09c7d911 100755 --- a/src/main/webapp/js/poiFormMap.js +++ b/src/main/webapp/js/poiFormMap.js @@ -2,18 +2,18 @@ * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/poiListMap.js b/src/main/webapp/js/poiListMap.js index 1493b3c9..c8f46c4b 100755 --- a/src/main/webapp/js/poiListMap.js +++ b/src/main/webapp/js/poiListMap.js @@ -2,18 +2,18 @@ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/util.js b/src/main/webapp/js/util.js index 025de9e6..193a5624 100755 --- a/src/main/webapp/js/util.js +++ b/src/main/webapp/js/util.js @@ -2,18 +2,18 @@ * Copyright (c) 2017 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/validateForm.js b/src/main/webapp/js/validateForm.js index 3fa7365f..0e4a8e21 100755 --- a/src/main/webapp/js/validateForm.js +++ b/src/main/webapp/js/validateForm.js @@ -2,18 +2,18 @@ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, +* This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ /* diff --git a/src/main/webapp/js/weatherStationFormMap.js b/src/main/webapp/js/weatherStationFormMap.js index 6264a366..a4984f4d 100755 --- a/src/main/webapp/js/weatherStationFormMap.js +++ b/src/main/webapp/js/weatherStationFormMap.js @@ -2,18 +2,18 @@ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/weatherStationListMap.js b/src/main/webapp/js/weatherStationListMap.js index 7e496be8..d8b87cb8 100755 --- a/src/main/webapp/js/weatherStationListMap.js +++ b/src/main/webapp/js/weatherStationListMap.js @@ -1,19 +1,18 @@ /* * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * - * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/js/weatherStationViewMap.js b/src/main/webapp/js/weatherStationViewMap.js index a8241159..8736c17f 100755 --- a/src/main/webapp/js/weatherStationViewMap.js +++ b/src/main/webapp/js/weatherStationViewMap.js @@ -2,18 +2,18 @@ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.css b/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.css index c3e5c630..9b7c7980 100644 --- a/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.css +++ b/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.css @@ -2,18 +2,19 @@ Copyright (c) 2018 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. -VIPSLogic is free software: you can redistribute it and/or modify -it under the terms of the NIBIO Open Source License as published by -NIBIO, either version 1 of the License, or (at your option) any -later version. -VIPSLogic is distributed in the hope that it will be useful, +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -NIBIO Open Source License for more details. +GNU Affero General Public License for more details. -You should have received a copy of the NIBIO Open Source License -along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.js b/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.js index 67e08091..c87f5075 100644 --- a/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.js +++ b/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.js @@ -2,18 +2,18 @@ * Copyright (c) 2019 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, +* This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/public/nordic_septoria_whs/nordic_septoria_whs.css b/src/main/webapp/public/nordic_septoria_whs/nordic_septoria_whs.css index 9f0e77d4..0b58a1fd 100644 --- a/src/main/webapp/public/nordic_septoria_whs/nordic_septoria_whs.css +++ b/src/main/webapp/public/nordic_septoria_whs/nordic_septoria_whs.css @@ -2,18 +2,19 @@ Copyright (c) 2018 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. -VIPSLogic is free software: you can redistribute it and/or modify -it under the terms of the NIBIO Open Source License as published by -NIBIO, either version 1 of the License, or (at your option) any -later version. -VIPSLogic is distributed in the hope that it will be useful, +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -NIBIO Open Source License for more details. +GNU Affero General Public License for more details. -You should have received a copy of the NIBIO Open Source License -along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* diff --git a/src/main/webapp/public/nordic_septoria_whs/nordic_septoria_whs.js b/src/main/webapp/public/nordic_septoria_whs/nordic_septoria_whs.js index 7ed8f658..5498fab1 100644 --- a/src/main/webapp/public/nordic_septoria_whs/nordic_septoria_whs.js +++ b/src/main/webapp/public/nordic_septoria_whs/nordic_septoria_whs.js @@ -2,18 +2,18 @@ * Copyright (c) 2019 NIBIO <http://www.nibio.no/>. * * This file is part of VIPSLogic. - * VIPSLogic is free software: you can redistribute it and/or modify - * it under the terms of the NIBIO Open Source License as published by - * NIBIO, either version 1 of the License, or (at your option) any - * later version. - * - * VIPSLogic is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * NIBIO Open Source License for more details. + * GNU Affero General Public License for more details. * - * You should have received a copy of the NIBIO Open Source License - * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. * */ diff --git a/src/main/webapp/templates/appleFruitMothClusterForm.ftl b/src/main/webapp/templates/appleFruitMothClusterForm.ftl index 4e50de7f..91129151 100644 --- a/src/main/webapp/templates/appleFruitMothClusterForm.ftl +++ b/src/main/webapp/templates/appleFruitMothClusterForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2017 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/appleFruitMothStationForm.ftl b/src/main/webapp/templates/appleFruitMothStationForm.ftl index bb7604e8..ab0e3bec 100755 --- a/src/main/webapp/templates/appleFruitMothStationForm.ftl +++ b/src/main/webapp/templates/appleFruitMothStationForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/appleFruitMothStationList.ftl b/src/main/webapp/templates/appleFruitMothStationList.ftl index e86ade49..9d25f347 100755 --- a/src/main/webapp/templates/appleFruitMothStationList.ftl +++ b/src/main/webapp/templates/appleFruitMothStationList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. +This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/cropCategoryList.ftl b/src/main/webapp/templates/cropCategoryList.ftl index 12f7c07e..de516c8f 100755 --- a/src/main/webapp/templates/cropCategoryList.ftl +++ b/src/main/webapp/templates/cropCategoryList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/cropList.ftl b/src/main/webapp/templates/cropList.ftl index 9f45f521..bc9dcfb4 100755 --- a/src/main/webapp/templates/cropList.ftl +++ b/src/main/webapp/templates/cropList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/cropPestForm.ftl b/src/main/webapp/templates/cropPestForm.ftl index 46258b93..30c736e1 100755 --- a/src/main/webapp/templates/cropPestForm.ftl +++ b/src/main/webapp/templates/cropPestForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/error_unknown.ftl b/src/main/webapp/templates/error_unknown.ftl index d53ec307..9a731004 100755 --- a/src/main/webapp/templates/error_unknown.ftl +++ b/src/main/webapp/templates/error_unknown.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro navbar_collapse> diff --git a/src/main/webapp/templates/forecastConfigurationForm.ftl b/src/main/webapp/templates/forecastConfigurationForm.ftl index 803f5600..b0b605e1 100755 --- a/src/main/webapp/templates/forecastConfigurationForm.ftl +++ b/src/main/webapp/templates/forecastConfigurationForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.viewForecastConfiguration}</title> diff --git a/src/main/webapp/templates/forecastConfigurationList.ftl b/src/main/webapp/templates/forecastConfigurationList.ftl index 46a9a094..7cc0da09 100755 --- a/src/main/webapp/templates/forecastConfigurationList.ftl +++ b/src/main/webapp/templates/forecastConfigurationList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2017 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 1915ff65..b7d7569e 100755 --- a/src/main/webapp/templates/index.ftl +++ b/src/main/webapp/templates/index.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 e0a5e522..6866a069 100755 --- a/src/main/webapp/templates/login.ftl +++ b/src/main/webapp/templates/login.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 50aa9196..0027c08c 100755 --- a/src/main/webapp/templates/master.ftl +++ b/src/main/webapp/templates/master.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 a3497600..034bbc1e 100755 --- a/src/main/webapp/templates/master_errorpages.ftl +++ b/src/main/webapp/templates/master_errorpages.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 f76c36a5..2c5abca6 100755 --- a/src/main/webapp/templates/messageForm.ftl +++ b/src/main/webapp/templates/messageForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 e7daaabb..d8e3f59b 100755 --- a/src/main/webapp/templates/messageList.ftl +++ b/src/main/webapp/templates/messageList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.messages}</title> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteCandidateList.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteCandidateList.ftl index de62e7c0..009dac44 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteCandidateList.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteCandidateList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2020 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "../../master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteDeleteForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteDeleteForm.ftl index 84b62f57..0039106a 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteDeleteForm.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteDeleteForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2020 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "../../master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl index cc9561a3..68913bfd 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2020 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "../../master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl index e43b0f8d..c6be044f 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2020 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "../../master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteMaintenanceList.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteMaintenanceList.ftl index ddd82fd3..1f12591a 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteMaintenanceList.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsiteMaintenanceList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2020 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "../../master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsitesStatus.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsitesStatus.ftl index d18027a5..23e1e903 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsitesStatus.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleSeasonTrapsitesStatus.ftl @@ -2,18 +2,18 @@ Copyright (c) 2021 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "../../master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleTimeseriesCalculation.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleTimeseriesCalculation.ftl index b79d0042..43cda9e9 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleTimeseriesCalculation.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleTimeseriesCalculation.ftl @@ -2,18 +2,18 @@ Copyright (c) 2020 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "../../master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl b/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl index a84f63a9..afa8d119 100644 --- a/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl +++ b/src/main/webapp/templates/modules/barkbeetle/barkbeetleTrapsiteRegistrationForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2022 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "../../master.ftl"> <#assign siteName= seasonTrapsite.countyName + "/" + seasonTrapsite.municipalityName + "/" + seasonTrapsite.ownerName> diff --git a/src/main/webapp/templates/notificationSubscriptionForm.ftl b/src/main/webapp/templates/notificationSubscriptionForm.ftl index edf0b8cb..ed10641b 100755 --- a/src/main/webapp/templates/notificationSubscriptionForm.ftl +++ b/src/main/webapp/templates/notificationSubscriptionForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.user}</title> diff --git a/src/main/webapp/templates/observationForm.ftl b/src/main/webapp/templates/observationForm.ftl index 24bd4a96..43590675 100755 --- a/src/main/webapp/templates/observationForm.ftl +++ b/src/main/webapp/templates/observationForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2017 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/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 10f856ff..90db0a5a 100755 --- a/src/main/webapp/templates/observationList.ftl +++ b/src/main/webapp/templates/observationList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#setting time_zone=user.organizationId.defaultTimeZone!"UTC"> <#macro page_head> diff --git a/src/main/webapp/templates/observationMap.ftl b/src/main/webapp/templates/observationMap.ftl index 4adc17aa..08edca4b 100755 --- a/src/main/webapp/templates/observationMap.ftl +++ b/src/main/webapp/templates/observationMap.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY 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 this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#setting time_zone=user.organizationId.defaultTimeZone!"UTC"> <#macro page_head> diff --git a/src/main/webapp/templates/organism.ftl b/src/main/webapp/templates/organism.ftl index c1fb8fbc..07a2dbe7 100755 --- a/src/main/webapp/templates/organism.ftl +++ b/src/main/webapp/templates/organism.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/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 854f61dc..091f4d67 100755 --- a/src/main/webapp/templates/organismDetails.ftl +++ b/src/main/webapp/templates/organismDetails.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/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 60fb9399..af37b76e 100755 --- a/src/main/webapp/templates/organismForm.ftl +++ b/src/main/webapp/templates/organismForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/organismList.ftl b/src/main/webapp/templates/organismList.ftl index 03489d91..73957b29 100755 --- a/src/main/webapp/templates/organismList.ftl +++ b/src/main/webapp/templates/organismList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/organizationForm.ftl b/src/main/webapp/templates/organizationForm.ftl index 78fa94de..50ac1afc 100644 --- a/src/main/webapp/templates/organizationForm.ftl +++ b/src/main/webapp/templates/organizationForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title><#if organization.organizationId?has_content>${i18nBundle.editOrganization} ${organization.organizationName}<#else>${i18nBundle.newOrganization}</#if></title> diff --git a/src/main/webapp/templates/organizationGroupForm.ftl b/src/main/webapp/templates/organizationGroupForm.ftl index 67636aad..35e34e86 100755 --- a/src/main/webapp/templates/organizationGroupForm.ftl +++ b/src/main/webapp/templates/organizationGroupForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.edit} ${organizationGroup.groupName!i18nBundle.newGroup?lower_case}</title> diff --git a/src/main/webapp/templates/organizationGroupList.ftl b/src/main/webapp/templates/organizationGroupList.ftl index 29e65a01..260c558c 100755 --- a/src/main/webapp/templates/organizationGroupList.ftl +++ b/src/main/webapp/templates/organizationGroupList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.organizationGroupList}</title> diff --git a/src/main/webapp/templates/organizationList.ftl b/src/main/webapp/templates/organizationList.ftl index 917b85a6..5c3da514 100644 --- a/src/main/webapp/templates/organizationList.ftl +++ b/src/main/webapp/templates/organizationList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2019 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.organizations}</title> diff --git a/src/main/webapp/templates/pestList.ftl b/src/main/webapp/templates/pestList.ftl index 9b860efe..cbec07b4 100755 --- a/src/main/webapp/templates/pestList.ftl +++ b/src/main/webapp/templates/pestList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/poi.ftl b/src/main/webapp/templates/poi.ftl index 960dd823..c041605b 100755 --- a/src/main/webapp/templates/poi.ftl +++ b/src/main/webapp/templates/poi.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>POI</title> diff --git a/src/main/webapp/templates/poiDeletePreview.ftl b/src/main/webapp/templates/poiDeletePreview.ftl index bccee456..07cf886c 100644 --- a/src/main/webapp/templates/poiDeletePreview.ftl +++ b/src/main/webapp/templates/poiDeletePreview.ftl @@ -2,18 +2,18 @@ Copyright (c) 2015 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.deletePoi}</title> diff --git a/src/main/webapp/templates/poiForm.ftl b/src/main/webapp/templates/poiForm.ftl index 64127dda..58fe8f49 100755 --- a/src/main/webapp/templates/poiForm.ftl +++ b/src/main/webapp/templates/poiForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title><#if poi.pointOfInterestId?has_content>${i18nBundle.editPoi}<#else>${i18nBundle.newPoi}</#if></title> diff --git a/src/main/webapp/templates/poiList.ftl b/src/main/webapp/templates/poiList.ftl index 12bd313f..c9360f82 100755 --- a/src/main/webapp/templates/poiList.ftl +++ b/src/main/webapp/templates/poiList.ftl @@ -1,19 +1,18 @@ <#-- Copyright (c) 2014 NIBIO <http://www.nibio.no/>. - This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.pois}</title> diff --git a/src/main/webapp/templates/registerOpenIdForm.ftl b/src/main/webapp/templates/registerOpenIdForm.ftl index 0103893f..86271ae1 100755 --- a/src/main/webapp/templates/registerOpenIdForm.ftl +++ b/src/main/webapp/templates/registerOpenIdForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/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 69d9e3c3..2ee39d7b 100755 --- a/src/main/webapp/templates/resetPasswordForm.ftl +++ b/src/main/webapp/templates/resetPasswordForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/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 72f277ea..788df795 100755 --- a/src/main/webapp/templates/resetPasswordRequestForm.ftl +++ b/src/main/webapp/templates/resetPasswordRequestForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/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 698fd9eb..eb1064c8 100755 --- a/src/main/webapp/templates/runTaskManuallyForm.ftl +++ b/src/main/webapp/templates/runTaskManuallyForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> diff --git a/src/main/webapp/templates/taskHistoryDetails.ftl b/src/main/webapp/templates/taskHistoryDetails.ftl index fb482fa3..2cdaceb4 100755 --- a/src/main/webapp/templates/taskHistoryDetails.ftl +++ b/src/main/webapp/templates/taskHistoryDetails.ftl @@ -1,19 +1,18 @@ <#-- Copyright (c) 2014 NIBIO <http://www.nibio.no/>. - This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/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 353c2c23..440ebc52 100755 --- a/src/main/webapp/templates/taskList.ftl +++ b/src/main/webapp/templates/taskList.ftl @@ -1,19 +1,18 @@ <#-- Copyright (c) 2014 NIBIO <http://www.nibio.no/>. - This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.tasks}</title> diff --git a/src/main/webapp/templates/userDeleteForm.ftl b/src/main/webapp/templates/userDeleteForm.ftl index 7cf11937..c258a807 100755 --- a/src/main/webapp/templates/userDeleteForm.ftl +++ b/src/main/webapp/templates/userDeleteForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2015 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - NIBIO is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.deleteUser}</title> diff --git a/src/main/webapp/templates/userForm.ftl b/src/main/webapp/templates/userForm.ftl index e2dae36a..b0e54a4b 100755 --- a/src/main/webapp/templates/userForm.ftl +++ b/src/main/webapp/templates/userForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/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 b5a0d5ba..fee115be 100755 --- a/src/main/webapp/templates/userList.ftl +++ b/src/main/webapp/templates/userList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.users}</title> diff --git a/src/main/webapp/templates/userOrganizationGroupsList.ftl b/src/main/webapp/templates/userOrganizationGroupsList.ftl index 2dc46747..d50eab75 100755 --- a/src/main/webapp/templates/userOrganizationGroupsList.ftl +++ b/src/main/webapp/templates/userOrganizationGroupsList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2016 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.user}: ${i18nBundle.organizationGroupList?lower_case}</title> diff --git a/src/main/webapp/templates/userRegistrationForm.ftl b/src/main/webapp/templates/userRegistrationForm.ftl index 25dbeeda..23e64638 100755 --- a/src/main/webapp/templates/userRegistrationForm.ftl +++ b/src/main/webapp/templates/userRegistrationForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.registerNewUser}</title> diff --git a/src/main/webapp/templates/weatherstationDeletePreview.ftl b/src/main/webapp/templates/weatherstationDeletePreview.ftl index 366bd7ea..3fa661e7 100755 --- a/src/main/webapp/templates/weatherstationDeletePreview.ftl +++ b/src/main/webapp/templates/weatherstationDeletePreview.ftl @@ -2,18 +2,18 @@ Copyright (c) 2015 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. --><#include "master.ftl"> <#macro page_head> <title>${i18nBundle.deleteWeatherStation}</title> diff --git a/src/main/webapp/templates/weatherstationForm.ftl b/src/main/webapp/templates/weatherstationForm.ftl index a3292f9b..cb0a0afd 100755 --- a/src/main/webapp/templates/weatherstationForm.ftl +++ b/src/main/webapp/templates/weatherstationForm.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/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 3e7246bc..95199f8d 100755 --- a/src/main/webapp/templates/weatherstationList.ftl +++ b/src/main/webapp/templates/weatherstationList.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/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 8c9ca4ca..316cf035 100755 --- a/src/main/webapp/templates/weatherstationView.ftl +++ b/src/main/webapp/templates/weatherstationView.ftl @@ -2,18 +2,18 @@ Copyright (c) 2014 NIBIO <http://www.nibio.no/>. This file is part of VIPSLogic. - VIPSLogic is free software: you can redistribute it and/or modify - it under the terms of the NIBIO Open Source License as published by - NIBIO, either version 1 of the License, or (at your option) any - later version. - - VIPSLogic is distributed in the hope that it will be useful, + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - NIBIO Open Source License for more details. - - You should have received a copy of the NIBIO Open Source License - along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/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 3effc440..beef83de 100755 --- a/src/main/webapp/test/mock.kml +++ b/src/main/webapp/test/mock.kml @@ -4,19 +4,18 @@ * # # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # - # This file is part of VIPSLogic. - # VIPSLogic is free software: you can redistribute it and/or modify - # it under the terms of the NIBIO Open Source License as published by - # NIBIO, either version 1 of the License, or (at your option) any - # later version. - # - # VIPSLogic is distributed in the hope that it will be useful, + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # NIBIO Open Source License for more details. - # - # You should have received a copy of the NIBIO Open Source License - # along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see <https://www.gnu.org/licenses/>. # * */ -- GitLab