diff --git a/NIBIO_OPEN_SOURCE_LICENSE_1.05.txt b/NIBIO_OPEN_SOURCE_LICENSE_1.05.txt
deleted file mode 100755
index 98f5ab000c55833f24e593f2a8d5f3913aa64fc3..0000000000000000000000000000000000000000
--- 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 bfaf5ef4a76f98b451cbbca7fad7c0c6981c4d71..3c40ebdc2e567fe9aa9bf5d72a4d4690cf58c090 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 5d364fe65d744c84c4282e91f515509334eb7ad6..423ece4065f1d559f8168c56bb1f1bc2a68de6d5 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 128eefb6030f3cf5a41a41857f5ac6424bf49dd1..9dc5899cb552ec70b1aaacea16ba3ef18e569df3 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 9f1656df38a3f9a778613aacd3304c87ddbf6144..a09c9a93432e1c4e07b04308f6cdeb5a1d72c111 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 947d27d17a1f7e8ab711e36c5cc6eda5e01ba2a5..9242c667744bd99a132b18010f3063e2d7e39cb2 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 fe09b88cbada7004a4468ee8063d3c907252ae9d..77a55a05cbcba809fbb4980016e6f4ff59a26c96 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 ebcccfcd964e5e8ef78f45865299d0021ea15439..7bf587e1638bea50a065b5563946b3e595168465 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 2e80c64e0c63746a4921e473ba7af674708ce032..3d61ce6dd7daa152fab6a04fdf6abffb989d4bd6 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 a431e5ecf91a8274168bf9904ea0d6325f72533c..3f9f75738580e54e92bc5bfccf9d93fa0a62dac2 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 27b7151328d443f6f9e58ca5ac9fc8f9e938ba3a..3676563e415f62bc043d63f0f8cb128fdae6d46f 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 5707d82869792c3b8f93bcebfc443dbe4faafc68..5269bcd13598369ce1a8dd0d5e981d9a0add674e 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 8691b9a2ca1b2493e7d865e70e4187dd6b640311..e1e68614c4735e90b71925174aa7d5c76da1389f 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 5b0877cd55bc71a7d460e77512d8405e23b378f9..e53e14728a0e23505551f8711e2b1a34803beb1e 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 39d9ae9147275900d44614c1ed5173d58df3d4a6..62d85f54fb23655a8bafb80e6f02925b270da5a8 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 735c709a49f64c9f7da2feeae9fa99557f94699d..ab79fea3057eb20ca08c78ff2929583656a9c850 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 96a71743919ffb354618c63a123b38e3b0f84d1c..3762ccb429cfc8004a3b09c3b73ec844c5b39366 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 372c43657eff0ef8909984d7edb76db293c7f1fe..d0838304e354b94d8959b630cc2695ed7378a946 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 cec171ad58c8eb8607190424cf90a06a34d14a2a..cf7ca381ab7f0df517617df92d4c086ac27de953 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 621429ac22dc34982608de0b525dea2571020511..ec641b5f2a4a8190b31b833e06b47b93d8aa1196 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 c2eb651c24b8ec5687993edd4d49d9cc02812a60..cc91c3cd5c8f1a26fe74ce3e0001ca9223347d85 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 0273d045d5898e6c6ca56f872a46bd85f31e2dd6..95c43c592f962e33cfe7900f5c63fd43a3058314 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 a39766e81691a750c99585851bacd8d137ae1357..b3e2b1fae41777324a89ff09a0003645a21cfa7b 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 5e7b86b9c16319c421fc6c160cfe44f5a391e133..cc261e337dc41ea29893538a33a81bb3f38e26d5 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 f65768d9b5b42757927f41f5d0c05012930d4c41..95efe7e55169355532ae47460c1a43a33f2664a8 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 c087e0cf566befbb7ed316ffc8d2f7101546e1ab..ebf0634fd8b1fe8bad0a30e7a36b9ce1e76fcf37 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 e0de5760ae5667c202ab826b8dd9bd26ae9c91a9..cd24e726da0d13b4567a38b3a62a1190fb82cb40 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 894f9e46adc17634b5929304cecb790aca24cd24..8287d4e5ec04542fc10a63b87e811aa06478948b 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 8f0832917f2de63e67deb6b01aef2a810ad17f15..4053e2e499eb06f58640a31ada8b1e9689d7084d 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 6ac4bdcb966f4340d755a6f184e6827861c6d1a9..b7c9a74c2b077047cb16e853b81ad8b36c263b16 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 1403be2e085b3c3c87ebb7793da4360a08244587..0e2ea6e4b7f7ad8d488db73b8b43bdac049029c8 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 6ac4bdcb966f4340d755a6f184e6827861c6d1a9..b7c9a74c2b077047cb16e853b81ad8b36c263b16 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 195062a791aad3fb4be992b241f6df68d4726963..fbf19af2fe1c0992caa65a925d4d58009a673025 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 a8b79836ee0781bd5b0315aae32cc0c3c2e00f06..9a1e2f5f74cb07f368bf7113a4c197157c70454e 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 67df9b207094f6d215c5cae64afb604f0180fe04..27fcdf690a0eda3f821191ae9a4dd86270a194c5 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 2fc42b68dc692767bb85de9973ff752460cb3daf..cfe845a0a6df641438cf6db61c115a662f542aac 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 2e76ad6dc0ec77e52aa750ef4a81539a3a1e91e1..3d8857dca8931eff19255e3621ae74e853bd28de 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 a05d85da83305946d55789957661d7d941043961..f0d24fe30dfbceec6c990cfa735d6f53aaa7adac 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 ed54bdb5c5fafe1a3d9fa0f7f8080b422c531449..b0e827d49178fee71b0054fad165ce0a9b0d58c3 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 4f1488884551635e5e51ff0b086dc54a92f3c746..c2be39ae49f0776c485c2f82b758b4a0d35f443c 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 d2c2515429dc1994d03603cef04aac7483e6acb0..82fcbe7014005568cb1818e46e158a0eccf7c366 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 7c94af31faf124711094739e746fd73c25d14a94..2de41ab0196d077365aa537f2416b4aa6d9a0d93 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 f30421fd84021d4adc3f8dfcc2a2177a549c3684..ba30bd68b76ba0f93259d2121049815c9e05de69 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 55341a1d42d704fc51e58bc907b98cb22e32c58c..35ff2bb2484e6941708f8b8691906ef39786d9ff 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 684587c143bd8746b08b341ab9d8f724d4880886..0514d3de83ef9086c17fcf15d824e878a5e2fba9 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 b5c3916d653a0003accdcf5aad7d5e66c64db05c..f1917c53610820524a1ed9d65af264a33ed838cd 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 94cba116a03b38f57f532d5b304886b901a03afc..f7a8cbc196d6209b8dab7901bfeb60f0e4634396 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 b091e01c2b4e844ac732289f805fab1e6d2fed49..882a2bcc376257777f2bead306e5ed396d4e47a4 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 ebd0ec05075956d066f527695bc3038e6944a1ed..57cba74120457858afce2b2dcfcc7d329e828e0a 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 d559d505a6448e709b514ea2f8b1b1e4bbcd70d6..d55a16babdbfe710cefafe2e84a208b6b4657211 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 77149662796904cf768c17df4098981180afe0c3..ae6027c37e60fa7ed8d0531b73e945e5c2676f98 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 48c7c5bcf0603ae662e5fb5d1a42480e3a4db9c0..8395e8fc15e16a9fd4aaa0ef7821bef52cafcf10 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 cf1de2562347f7e057554f8b8bbd7d0e6fd4a35e..acc63d9e460de6b61f08b83b7870926d11bfce3f 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 3308d175b404b401de848c81d91e96d950785447..66ddb20e1b324467855cd9db593fc26248003792 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 fbb1808a68733ba8baf1a5cd91475f436da8881b..6aa6e956f28c279cad1d247f5e35be0069ed9921 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 024d351b8f5291e5cceb7b2fa13f3d9ba4f9b733..52486af534d6a4f6c4dde4675ac4ac8351cc790f 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 ded4cc3214d8b4a07e563a69da3061c6a9c4c471..ae2d963d954ad9b47949d711445a179bd17813dd 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 2f9f8ac17acd908a308d41e3ccde8a9864a94f0c..3f89913a55e81cbe0299b34225cb9bd18c8c6d4f 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 93cf962af0c38bad288dfa9f8e60358b97d1c661..f727874a739c96cd94e5fa28442df8d1b16558bc 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 04f7d313942f974f9da3604d54839e73f6599723..4ab7675ea40118d7ab5c555ada284020e7ff63ea 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 2a1f9fb40a6b628f8adaea2e4fc8579329a4e888..e658e4e032bd411ed50af571a8aa71d6bb93c444 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 3b44022994b90acde404fbb5a82639094b3b506a..27c0f5ca5bfa98f48ada095177736e3a143d3be0 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 1bc2f92be78d4c23f1a599bada42d9b7102684ba..c4540a5267b1559eafb1ea817be29cd8f613bc6b 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 d859edea2bc0f074a316a928db4c07e606585dfa..664355561fe30048188cbdb6fdae743d103b2542 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 d6675744544d360eb257553906692ffab665562e..4502cfcd7d2fe57a3e6b6a6acb14dc25ca3c764e 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 ebcf5c32812017a5955f35847292153fb8e6fa1d..fe1615bef324e9acd0029844168975dedcc29615 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 12ce726e0f9d67f0a170921e9e4e6d991ea538eb..12b455125fc0edf7c8e5b40a81c1bd3f10082d54 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 27fa3517f7a5ebd67a6b0ba0daa94d465c462704..331e0b7209c4d2eaa35dfaadf1d20f40acc05311 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 45f18f6136ff6266168c35d785fc371467944be5..43f44a8932711702fee7c42791766375e3407b9a 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 895b37f5f23c9101fce18f262b0a331358ce1c99..7aa33f4ad08da6dad093fe20fb9aa4bead6f9dda 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 7380cc9e01fd4d3c02fd310d9aa161be9a8c9d19..6292a567342595672b6a6666963141a9fdd023ca 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 fa6cd64a9ed4d8576d4679941d629612f08d11e0..e56752026aa4158d931ada25587cc1bab8fb1278 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 10ea2c942644d1be9ad8794ee69c9925a4e3a50b..09c7d911e0b9cc5fcfc69dfc8971d217a3f9c90f 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 1493b3c9828eccb91982bac4cc6149038efcabc6..c8f46c4b8fc3b97907248f43e2221d9e1906db21 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 025de9e68dde6ae9119673dd53e311e4fc008a9f..193a56249727b373aa7f9471f457d27a60bc6296 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 3fa7365ff1fb573ac887fb1aad9974474990874c..0e4a8e2199f33cc8708ad12f040b266889a1dd31 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 6264a3667fcb50358b5ff8ff7443dab608bbb8ab..a4984f4d711d178e2bf03cfbb673ca4ef8055616 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 7e496be845b246d101036ba649072bda0920943c..d8b87cb834aeffb0af1107f746742a34c2baaea3 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 a8241159c6f2785cbf1e5dfc48a4da9d011fef36..8736c17f456b04511c85b35beca5cd4dc3370dde 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 c3e5c6305237e132dd740ddf28f2fe36d868f910..9b7c79806bf8e9eadc8d51601fb9bfbe17a4569d 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 67e08091b868a4f99b92d747c9891df78b9f7302..c87f5075dbd2fa483db668c0b61319a797e0b108 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 9f0e77d4d84838c2eadf64093e7d7cb47ea96924..0b58a1fd309d6fc8cdf0fe85fffc0b46c0f8fbec 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 7ed8f6582c87e82e9601efcb10b9960bd751769a..5498fab16dfcc489234090f866ae9409f618b6a7 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 4e50de7fa029e049a34873971691b4b45d817799..91129151a310e38d60abcda73c6a6cf4752096d3 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 bb7604e85e50a2d6375fdb149ff96679f6d98816..ab0e3bec0c3c8e5aae338e04083ceff9beeda208 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 e86ade492a79a7366d676b3a6d7a80aae52ccb8f..9d25f3472a7e8d843e199e7acaa231566c9b935a 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 12f7c07ecef184d30a4bc445747b17cc380644c7..de516c8fdfbbd144efb7d46c64b9513c1db93199 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 9f45f5219d46c85189c5fca7d40834195cd1ed79..bc9dcfb487d6773f9792ba7a4dbe9d61953609ce 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 46258b93fac5310ae56a4c9d1a5e08d3165133cb..30c736e101faec7ccaeafa845991281511c43677 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 d53ec30701697063cd81699deb8a4066b515a624..9a731004041486b9dfba05dd7febd26f7eb2bd15 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 803f5600cc96fd4fede4fbd35d3b2b0d9494d572..b0b605e18e27ff71d0c2bb95e2e50c70aba8f0b0 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 46a9a094177ff09a8e53026d715ac67eca039c95..7cc0da099ce8a128cf684f5e8ccf749aa1f56112 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 1915ff655f1de983ad4ac895b914757d6441ee8e..b7d7569e1e53917d452eb4df903246f578ca995f 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 e0a5e522c0483945bd4bed81dbde6167f169fdd4..6866a06911ce1dc46993d2d20257d19a101a999f 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 50aa9196cf4050b1bb997f3fb58944e785e37c70..0027c08c231fb3c53e0a7141a1e240a62efbf4d2 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 a349760063461a137417d84bc229cbc755ea32d9..034bbc1e7adbbbceec380248fe337545ef129c77 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 f76c36a5b2c453c922b40851249e5093c9ddf275..2c5abca6ecc43f884fef01813c154577b49e1949 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 e7daaabba455770667db94f410d59c3aa8c7555d..d8e3f59bc2d476f3ac489417cf7cf149bf065012 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 de62e7c0af748894e44e6eb013511c33ae392a7c..009dac4437401b45cf1b8bc089aed44214fc0bbf 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 84b62f57bf41c49a0b1984385c01b3e1affb73ae..0039106acdee56d62c768b1edb554ac9222ce744 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 cc9561a3c8d8cb186364c746f5896433b5240eb6..68913bfd810fbc14ea9c5c316af6f4074a305b45 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 e43b0f8dc833ee3ed3c0c044205eae2d9b311255..c6be044f6868842732774a6830b470ea47b63b0a 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 ddd82fd30f457b28e8d49a2112eb86e066f268f0..1f12591ac8aae3e827be2acb3dab54e68a5ab186 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 d18027a5dcd312e05be5a0babf67db730c2d1551..23e1e90332c852b397d04ad3e8b0ecaf7615cbd8 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 b79d00424cd401f6d0c4b906a42101fd25c0046f..43cda9e962aaabfe321a558d93ca615ed074b246 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 a84f63a9af15a4d2f2555a234c41945abb97e3d2..afa8d1193be3f0e578135462f69e659f82ba8695 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 edf0b8cbdffc85f97787da19cab586da797830b3..ed10641b5454980d882e89c8e77c970f0ace6777 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 24bd4a96734a5a81fba65880447344c36c05f3c8..43590675ff00a49c696e16e6595b71d55c3603df 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 10f856ffd2ab037069a37a22fe3f9f00dbcdcd8d..90db0a5a6acc884a9626c53ad5ff2f3722113ce6 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 4adc17aa76a196a5c2ca470c2d7d841a49e0b5d6..08edca4b6135dc27c62c9ed50af7fe06c293da04 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 c1fb8fbc4ee4fdc8c2afbd534272e766440b86bd..07a2dbe744a302a56f244b95ae93350317e9adbe 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 854f61dcd1beac4b9f424638a1b590a8c46af837..091f4d6797c44ac62bcc7846eff0b7d39662a45b 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 60fb939962e4b75752c7c3fc458c5755af664212..af37b76e48ace8f8cb552165d53450085b3af569 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 03489d91d7e6ced1b32d5feb3d0cf934ddcdd4c3..73957b29fc765f42fb1e38a5f443f822b9b7952e 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 78fa94ded9ba695ffc662de0b22d216c0f059054..50ac1afc38f3741305c4cec59726a0e8d09ee2c6 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 67636aad9e32c44023525cbb2e2951773bf3bc63..35e34e8628310bf4a0c35a4f223ddc717ed42b78 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 29e65a01b5f71cd94c8643d6568f8e919759cb4c..260c558ce6c925f2e1ada5c4f49e51a414cc582f 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 917b85a675008e22e8fd5475c52e2ce4fe59bf09..5c3da5149173c7df4b02b6bda0afa033d8dcce99 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 9b860efe6f9e1e534fb0a0d45ec5b8b8e7aee411..cbec07b41646a17d35467d95f932b9729a264232 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 960dd8238c1da3a9eb967692ebd1e195e24444b9..c041605b102c0ee161932051ec00d9322934c0d2 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 bccee4564c1d02ca082c914c6203c68f1855483c..07cf886cc946dc8e8ab7a511d1cb7c41f51f22ca 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 64127ddab64ad8ed755c0f3c1d833cc36f2816b1..58fe8f499d7c016a75595b1ddc7100efed9f3be0 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 12bd313f568a55f62abd029a0bde6694cd48d301..c9360f82e75ce3b5cc5514899c4d25ca7c29096f 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 0103893f0200341715e370f28c34c892d976ea6a..86271ae182000199825520060ebe37967c0f5854 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 69d9e3c38424635a4f286033fb2386b37406a267..2ee39d7b7c05b97c0e49cafea011ba99f56d9ac0 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 72f277eae227cfb1fa2e4028e5ff49476fc558b5..788df79546a4ca577f507af49f680bf339caed0e 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 698fd9ebed86ac322e02fd07fcfee7b17d6372fd..eb1064c8926b35ecc66c5acd4c77b64c3425b019 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 fb482fa35efc1437b8cd92ea128ff5021eededf8..2cdaceb4e6366b57e404b061746c7fb359d3c4fd 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 353c2c232e29779696ba9604201cb7919b87398c..440ebc529c0f477d7e4a61372d18783b8c783ebd 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 7cf11937fa862a50ea4a04c357497bcad530c436..c258a807a962d6286321e93abf7167d29adaa6a5 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 e2dae36ade26ea17deb8c2a0b6bb5067a771489e..b0e54a4b8286b81247c51ff9b4e95061cf6fb4a0 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 b5a0d5ba96d48a5451368b3d0ae189f68a9cc421..fee115be72901a7cff0db1ee6e51ef4543db41f0 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 2dc46747e5d5f9e9579c8de674111ca55983c266..d50eab75c67090b62fcf5aed3a9a073a791296af 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 25dbeeda88a46d2b538456071d3276dde85cfa32..23e64638a1765df697bf4e72548aae4088e0642a 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 366bd7eaab0adb23f1faf2d2b159a794de9f124f..3fa661e7a052c09de7cfcb7cb0bd43a4d77e9f04 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 a3292f9baf30bc4b759ff43d15fd15211c93b39e..cb0a0afd4225804dbd7e48e967bb728f792b50d9 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 3e7246bc737e4455112008e2e2fae8706e8a9e9c..95199f8dbd15615d7d5f025783f2af576a707cc5 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 8c9ca4ca5f91f4e6943eeaed9ff4e3d3b550a8ec..316cf035d7dc20abd91457cb28ded09e6dfae9e9 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 3effc4404b4c5f35d339529163d423291ab0d83a..beef83de5d32cfd155e8ceb88c33be339f301207 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/>.
#
*
*/