Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 16bd168a by Tony Chemit at 2023-11-25T14:57:31+01:00 Supprimer le module server-configuration-tool (il ne sert pas) - Closes #2807 - - - - - 28 changed files: - − server/configuration-tools/.mvn/pom.gitflow.develop - − server/configuration-tools/.mvn/pom.gitflow.master - − server/configuration-tools/.mvn/pom.organizationId - − server/configuration-tools/.mvn/pom.projectId - − server/configuration-tools/.mvn/pom.stageId - − server/configuration-tools/LICENSE.txt - − server/configuration-tools/README.md - − server/configuration-tools/pom.xml - − server/configuration-tools/src/main/assembly/bin.xml - − server/configuration-tools/src/main/assembly/dist/default-migrate-server-v7.sh - − server/configuration-tools/src/main/assembly/dist/migrate-server-v7.bat - − server/configuration-tools/src/main/assembly/dist/migrate-server-v7.sh - − server/configuration-tools/src/main/assembly/dist/optimize-server-v9.bat - − server/configuration-tools/src/main/assembly/dist/optimize-server-v9.sh - − server/configuration-tools/src/main/java/fr/ird/observe/server/configuration/tools/ServerModelMigrate.java - − server/configuration-tools/src/main/java/fr/ird/observe/server/configuration/tools/ServerModelOptimize.java - − server/configuration-tools/src/main/resources/log4j2.xml - − server/configuration-tools/src/site/site.xml - − server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ServerModelMigrateTest.java - − server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ServerModelOptimizeTest.java - − server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ToolsFixtures.java - − server/configuration-tools/src/test/resources/fixtures-security-not-optimized.yml - − server/configuration-tools/src/test/resources/fixtures-security.yml - − server/configuration-tools/src/test/resources/v7/databases.yml - − server/configuration-tools/src/test/resources/v7/users.yml - server/pom.xml - server/runner/pom.xml - server/runner/src/main/assembly/server.xml Changes: ===================================== server/configuration-tools/.mvn/pom.gitflow.develop deleted ===================================== @@ -1 +0,0 @@ -develop \ No newline at end of file ===================================== server/configuration-tools/.mvn/pom.gitflow.master deleted ===================================== @@ -1 +0,0 @@ -master \ No newline at end of file ===================================== server/configuration-tools/.mvn/pom.organizationId deleted ===================================== @@ -1 +0,0 @@ -ultreiaio \ No newline at end of file ===================================== server/configuration-tools/.mvn/pom.projectId deleted ===================================== @@ -1 +0,0 @@ -ird-observe \ No newline at end of file ===================================== server/configuration-tools/.mvn/pom.stageId deleted ===================================== @@ -1 +0,0 @@ -frirdobserve \ No newline at end of file ===================================== server/configuration-tools/LICENSE.txt deleted ===================================== @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "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. - - 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. - - 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. - - 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. - - 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. - - 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. - - 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. - - 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. - - 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. - - 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. - - 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. - - 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. - - 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. - - 13. Use with the GNU Affero General Public License. - - 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 Affero 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 special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public 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 GNU General -Public 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 the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public 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. - - 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. - - 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. - - 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 - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<https://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<https://www.gnu.org/licenses/why-not-lgpl.html>. ===================================== server/configuration-tools/README.md deleted ===================================== @@ -1,50 +0,0 @@ -# Abstract - -This module exposes some tools around configuration of the server. - -## Migrate v7 server configuration files to v9 - -v7 need two configuration files (**databases.yml** and **users.yml**). - -v9 need only one file **security.yml**. - -Use **migrate-server-v7.sh** script to generate a v9 **security.yml** file from v7 files. - -The script requires three parameters: - -* input databases.yml file -* input users.yml file -* output security.yml file - -Example (using default values): - -```sh -sh migrate-server-v7.sh /var/local/observe-server/.conf/7.x/databases.yml /var/local/observe-server/.conf/7.x/users.yml /var/local/observe-server/.conf/9.x/security.yml -``` - -If you respect convention of the project. You can just launch the **default-migrate-server-v7.sh** script. - -Il will use the previous script with default values. - - -```sh -sh default-migrate-server-v7.sh -``` - -## Optimize v9 server configuration file - -v9 **security.yml** file can be optimized. - -Run the script **optimize-server-v9.sh** for this purpose. - - -The script requires two parameters: - -* input security.yml file -* output security.yml file - -Example (using default values): - -```sh -sh optimize-server-v9.sh /var/local/observe-server/.conf/9.x/security.yml /var/local/observe-server/.conf/server-optimized.yml -``` ===================================== server/configuration-tools/pom.xml deleted ===================================== @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe Server :: Configuration Tools - %% - Copyright (C) 2008 - 2023 IRD, Ultreia.io - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>fr.ird.observe</groupId> - <artifactId>server</artifactId> - <version>9.3.0-SNAPSHOT</version> - </parent> - <artifactId>server-configuration-tools</artifactId> - <name>ObServe Server :: Configuration Tools</name> - <description>ObServe Server configuration tools module</description> - <properties> - <applicationJarName>server-configuration-tools</applicationJarName> - </properties> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>toolkit-api-server</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>com.vladsch.flexmark</groupId> - <artifactId>flexmark</artifactId> - </exclusion> - <exclusion> - <groupId>com.vladsch.flexmark</groupId> - <artifactId>flexmark-ext-tables</artifactId> - </exclusion> - <exclusion> - <groupId>com.vladsch.flexmark</groupId> - <artifactId>flexmark-util-ast</artifactId> - </exclusion> - <exclusion> - <groupId>com.vladsch.flexmark</groupId> - <artifactId>flexmark-util-data</artifactId> - </exclusion> - <exclusion> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - </exclusion> - <exclusion> - <groupId>ognl</groupId> - <artifactId>ognl</artifactId> - </exclusion> - <exclusion> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </exclusion> - <exclusion> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.hashids</groupId> - <artifactId>hashids</artifactId> - </exclusion> - <exclusion> - <groupId>org.mozilla</groupId> - <artifactId>rhino-engine</artifactId> - </exclusion> - <exclusion> - <groupId>io.ultreia.java4all.http</groupId> - <artifactId>http-api</artifactId> - </exclusion> - <exclusion> - <groupId>io.ultreia.java4all</groupId> - <artifactId>application-template</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j2-impl</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <includeScope>runtime</includeScope> - <!-- <excludeScope>system</excludeScope>--> - <overWriteReleases>true</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <prependGroupId>true</prependGroupId> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - <silent>true</silent> - <!-- <excludeArtifactIds>com.google.auto.service:auto-service</excludeArtifactIds>--> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <archive> - <manifest> - <useUniqueVersions>false</useUniqueVersions> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - <classpathLayoutType>custom</classpathLayoutType> - <!--suppress UnresolvedMavenProperty --> - <customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout> - </manifest> - </archive> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-application-assembly</id> - <goals> - <goal>single</goal> - </goals> - <phase>integration-test</phase> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>true</attach> - <finalName>${project.build.finalName}</finalName> - <appendAssemblyId>false</appendAssemblyId> - <outputDirectory>${project.build.directory}</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> ===================================== server/configuration-tools/src/main/assembly/bin.xml deleted ===================================== @@ -1,86 +0,0 @@ -<!-- - #%L - ObServe Server :: Configuration Tools - %% - Copyright (C) 2008 - 2023 IRD, Ultreia.io - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> - <id>bin</id> - <formats> - <format>zip</format> - </formats> - - <fileSets> - - <fileSet> - <directory>target</directory> - <outputDirectory/> - <fileMode>0755</fileMode> - <includes> - <include>${project.build.finalName}.jar</include> - </includes> - </fileSet> - - <fileSet> - <directory>target</directory> - <outputDirectory/> - <includes> - <include>lib/*.jar</include> - </includes> - </fileSet> - - <fileSet> - <directory>target/classes</directory> - <outputDirectory/> - <includes> - <include>THIRD-PARTY.txt</include> - <include>LICENSE.txt</include> - </includes> - </fileSet> - - <fileSet> - <directory/> - <outputDirectory/> - <includes> - <include>README.md</include> - </includes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/dist</directory> - <outputDirectory/> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.sh</exclude> - <exclude>**/*.bat</exclude> - </excludes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/dist</directory> - <outputDirectory/> - <fileMode>0755</fileMode> - <filtered>true</filtered> - <includes> - <include>**/*.sh</include> - <include>**/*.bat</include> - </includes> - </fileSet> - </fileSets> -</assembly> ===================================== server/configuration-tools/src/main/assembly/dist/default-migrate-server-v7.sh deleted ===================================== @@ -1,27 +0,0 @@ -#!/bin/sh -### -# #%L -# ObServe :: Admin Client -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -java -cp ${project.build.finalName}.jar fr.ird.observe.server.configuration.tools.ServerModelMigrate /var/local/observe-server/.conf/7.x/databases.yml /var/local/observe-server/.conf/7.x/users.yml /var/local/observe-server/.conf/9.x/security.yml \ No newline at end of file ===================================== server/configuration-tools/src/main/assembly/dist/migrate-server-v7.bat deleted ===================================== @@ -1 +0,0 @@ -java -cp ${project.build.finalName}.jar fr.ird.observe.server.configuration.tools.ServerModelMigrate %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file ===================================== server/configuration-tools/src/main/assembly/dist/migrate-server-v7.sh deleted ===================================== @@ -1,27 +0,0 @@ -#!/bin/sh -### -# #%L -# ObServe :: Admin Client -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -java -cp ${project.build.finalName}.jar fr.ird.observe.server.configuration.tools.ServerModelMigrate "$@" \ No newline at end of file ===================================== server/configuration-tools/src/main/assembly/dist/optimize-server-v9.bat deleted ===================================== @@ -1 +0,0 @@ -java -cp ${project.build.finalName}.jar fr.ird.observe.server.configuration.tools.ServerModelOptimize %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file ===================================== server/configuration-tools/src/main/assembly/dist/optimize-server-v9.sh deleted ===================================== @@ -1,27 +0,0 @@ -#!/bin/sh -### -# #%L -# ObServe :: Admin Client -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -java -cp ${project.build.finalName}.jar fr.ird.observe.server.configuration.tools.ServerModelOptimize "$@" \ No newline at end of file ===================================== server/configuration-tools/src/main/java/fr/ird/observe/server/configuration/tools/ServerModelMigrate.java deleted ===================================== @@ -1,139 +0,0 @@ -package fr.ird.observe.server.configuration.tools; - -/*- - * #%L - * ObServe Server :: Configuration Tools - * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.server.security.model.ServerDatabase; -import fr.ird.observe.server.security.model.ServerModel; -import fr.ird.observe.server.security.model.ServerModelHelper; -import fr.ird.observe.server.security.model.ServerRole; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.IOException; -import java.io.StringWriter; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * To migrate server model from v7 → v9 - * Created on 13/12/2021. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 5.0.62 - */ -public class ServerModelMigrate { - - private static final Logger log = LogManager.getLogger(ServerModelMigrate.class); - - private final Path sourceDatabasesFile; - private final Path sourceUsersFile; - - public static void main(String... args) throws IOException { - if (args.length != 3) { - throw new IllegalArgumentException("Need exactly three parameters:\n\t - source databases file\n\t - source users file\n\t - target server file."); - } - Path sourceDatabasesFile = Path.of(args[0]); - Path sourceUsersFile = Path.of(args[1]); - Path targetFile = Path.of(args[2]); - - ServerModelMigrate migrate = new ServerModelMigrate(sourceDatabasesFile, sourceUsersFile); - migrate.migrate(targetFile); - } - - - public ServerModelMigrate(Path sourceDatabasesFile, Path sourceUsersFile) { - this.sourceDatabasesFile = Objects.requireNonNull(sourceDatabasesFile); - this.sourceUsersFile = Objects.requireNonNull(sourceUsersFile); - } - - public ServerModel migrate(Path targetFile) throws IOException { - if (Files.notExists(sourceDatabasesFile)) { - throw new IllegalArgumentException(String.format("Can't find %s", sourceDatabasesFile)); - } - if (Files.notExists(sourceUsersFile)) { - throw new IllegalArgumentException(String.format("Can't find %s", sourceUsersFile)); - } - if (Files.notExists(targetFile.getParent())) { - Files.createDirectories(targetFile.getParent()); - } - log.info(String.format("1/6 - Loading databases from: %s", sourceDatabasesFile)); - ServerModel serverModel = ServerModelHelper.load(sourceDatabasesFile.toFile()); - log.info(String.format("2/6 - Loading users from: %s", sourceUsersFile)); - List<String> usersContentLines = Files.readAllLines(sourceUsersFile); - - log.info("3/6 - Extract roles."); - Map<String, ServerRole> roleLoginMap = new LinkedHashMap<>(); - for (ServerDatabase database : serverModel.getDatabases()) { - LinkedHashSet<ServerRole> roles = new LinkedHashSet<>(); - for (ServerRole role : database.getRoles()) { - String roleLogin = role.getLogin(); - if (roleLoginMap.containsKey(roleLogin)) { - role = roleLoginMap.get(roleLogin); - } else { - roleLoginMap.put(roleLogin, role); - } - roles.add(role); - } - database.setRoles(roles); - } - LinkedHashSet<ServerRole> roles = new LinkedHashSet<>(roleLoginMap.values()); - serverModel.setRoles(roles); - - String content; - - log.info("4/6 - Generate file content."); - - try (StringWriter writer = new StringWriter()) { - String[] contentLines = ServerModelHelper.toString(serverModel).split("\\n"); - - for (String line : contentLines) { - if (line.contains("users:")) { - break; - } - writer.write(line); - writer.write("\n"); - } - int index = 0; - int usersContentLinesCount = usersContentLines.size(); - for (String line : usersContentLines) { - writer.write(line.replace("database: ", "database: *db-") - .replace("role: ", "role: *role-")); - if (++index < usersContentLinesCount) { - writer.write("\n"); - } - } - content = writer.toString(); - } - log.info("5/6 - Optimize content."); - ServerModel load = ServerModelHelper.load(content); - - log.info(String.format("5/6 - Write file: %s", targetFile)); - ServerModelHelper.store(targetFile.toFile(), load); - return load; - } -} ===================================== server/configuration-tools/src/main/java/fr/ird/observe/server/configuration/tools/ServerModelOptimize.java deleted ===================================== @@ -1,78 +0,0 @@ -package fr.ird.observe.server.configuration.tools; - -/*- - * #%L - * ObServe Server :: Configuration Tools - * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.server.security.model.ServerModel; -import fr.ird.observe.server.security.model.ServerModelHelper; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Objects; - -/** - * Created on 14/12/2021. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 5.0.63 - */ -public class ServerModelOptimize { - - - private static final Logger log = LogManager.getLogger(ServerModelOptimize.class); - - private final Path sourceFile; - private final Path targetFile; - - public static void main(String... args) throws IOException { - if (args.length != 2) { - throw new IllegalArgumentException("Need exactly two parameters:\n\t - input server file\n\t - target server file."); - } - Path sourceFile = Path.of(args[0]); - Path targetFile = Path.of(args[1]); - - ServerModelOptimize migrate = new ServerModelOptimize(sourceFile, targetFile); - migrate.optimize(); - } - - public ServerModelOptimize(Path sourceFile, Path targetFile) { - this.sourceFile = Objects.requireNonNull(sourceFile); - this.targetFile = Objects.requireNonNull(targetFile); - } - - public void optimize() throws IOException { - if (Files.notExists(sourceFile)) { - throw new IllegalArgumentException(String.format("Can't find %s", sourceFile)); - } - - if (Files.notExists(targetFile.getParent())) { - Files.createDirectories(targetFile.getParent()); - } - log.info(String.format("1/2 - Loading server from: %s", sourceFile)); - ServerModel serverModel = ServerModelHelper.load(sourceFile.toFile()); - log.info(String.format("2/2 - Write server to: %s", targetFile)); - ServerModelHelper.store(targetFile.toFile(), serverModel); - } -} ===================================== server/configuration-tools/src/main/resources/log4j2.xml deleted ===================================== @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe Server :: Configuration Tools - %% - Copyright (C) 2008 - 2023 IRD, Ultreia.io - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<Configuration status="error"> - <Appenders> - <Console name="console" target="SYSTEM_OUT"> - <PatternLayout pattern="%highlight{%-5p}{FATAL=white, ERROR=bright_red, WARN=yellow bold, INFO=blue bold, DEBUG=normal, TRACE=normal} %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/> - </Console> - </Appenders> - <Loggers> - <Logger name="fr.ird.observe.server.configuration.tools" level="info" additivity="false"> - <AppenderRef ref="console"/> - </Logger> - </Loggers> -</Configuration> ===================================== server/configuration-tools/src/site/site.xml deleted ===================================== @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe Toolkit :: API - %% - Copyright (C) 2008 - 2023 IRD, Ultreia.io - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.8.0" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> - <body> - <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - </breadcrumbs> - <menu ref="parent"/> - <menu ref="reports"/> - </body> -</project> ===================================== server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ServerModelMigrateTest.java deleted ===================================== @@ -1,59 +0,0 @@ -package fr.ird.observe.server.configuration.tools; - -/*- - * #%L - * ObServe Server :: Configuration Tools - * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.server.security.model.ServerModel; -import fr.ird.observe.server.security.model.ServerModelHelper; -import org.junit.Test; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -/** - * Created on 13/12/2021. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 9.0.0 - */ -public class ServerModelMigrateTest extends ToolsFixtures { - - @Test - public void migrate() throws IOException { - Path targetFile = Files.createTempFile("server", ".yml"); - - ServerModelMigrate migrate = new ServerModelMigrate(SOURCE_DATABASES_FILE, SOURCE_USERS_FILE); - ServerModel serverModel = migrate.migrate(targetFile); - - assertResult(targetFile); - System.out.println(ServerModelHelper.toString(serverModel)); - } - - @Test - public void migrateByMain() throws IOException { - Path targetFile = Files.createTempFile("server", ".yml"); - ServerModelMigrate.main(SOURCE_DATABASES_FILE.toString(), SOURCE_USERS_FILE.toString(), targetFile.toString()); - assertResult(targetFile); - } - -} ===================================== server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ServerModelOptimizeTest.java deleted ===================================== @@ -1,56 +0,0 @@ -package fr.ird.observe.server.configuration.tools; - -/*- - * #%L - * ObServe Server :: Configuration Tools - * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.junit.Test; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -/** - * Created on 14/12/2021. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 5.0.63 - */ -public class ServerModelOptimizeTest extends ToolsFixtures { - - @Test - public void main() throws IOException { - - Path targetFile = Files.createTempFile("security", ".yml"); - ServerModelOptimize.main(SOURCE_SECURITY_FILE_NOT_OPTIMIZED.toString(), targetFile.toString()); - assertResult(targetFile); - } - - @Test - public void optimize() throws IOException { - Path targetFile = Files.createTempFile("security", ".yml"); - - ServerModelOptimize migrate = new ServerModelOptimize(SOURCE_SECURITY_FILE_NOT_OPTIMIZED, targetFile); - migrate.optimize(); - - assertResult(targetFile); - } -} ===================================== server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ToolsFixtures.java deleted ===================================== @@ -1,74 +0,0 @@ -package fr.ird.observe.server.configuration.tools; - -/*- - * #%L - * ObServe Server :: Configuration Tools - * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.junit.Assert; -import org.junit.BeforeClass; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Iterator; -import java.util.List; - -/** - * Created on 14/12/2021. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 9.0.0 - */ -public class ToolsFixtures { - public static final Path PATH = Path - .of(new File("").getAbsolutePath()) - .resolve("src") - .resolve("test") - .resolve("resources") - .resolve("v7"); - public static final Path SOURCE_SECURITY_FILE_NOT_OPTIMIZED = PATH.getParent().resolve("fixtures-security-not-optimized.yml"); - public static final Path SOURCE_SECURITY_FILE = PATH.getParent().resolve("fixtures-security.yml"); - public static final Path SOURCE_DATABASES_FILE = PATH.resolve("databases.yml"); - public static final Path SOURCE_USERS_FILE = PATH.resolve("users.yml"); - public static File temporaryDirectory = new File(System.getProperty("java.io.tmpdir")); - - @BeforeClass - public static void init() throws IOException { - Files.createDirectories(temporaryDirectory.toPath()); - } - - public static void assertResult(Path targetFile) throws IOException { - List<String> actualModelContent = Files.readAllLines(targetFile); - List<String> expectedModelContent = Files.readAllLines(SOURCE_SECURITY_FILE); - - Assert.assertEquals(expectedModelContent.size(), actualModelContent.size()); - Iterator<String> actualIterator = actualModelContent.iterator(); - for (String expectedLine : expectedModelContent) { - String actualLine = actualIterator.next(); - Assert.assertEquals(expectedLine, actualLine - .replace("roles: ", "roles:") - .replace("databases: ", "databases:") - .replace("users: ", "users:") - ); - } - } -} ===================================== server/configuration-tools/src/test/resources/fixtures-security-not-optimized.yml deleted ===================================== @@ -1,54 +0,0 @@ -roles: - - &role-admin - login: admin - password: passwordAdmin - - &role-technicien - login: technicien - password: passwordTechnicien - - &role-utilisateur - login: utilisateur - password: passwordUtilisateur - - &role-referentiel - login: referentiel - password: passwordReferentiel - - &role-test - login: test - password: passwordTest -databases: - - &db-production - name: production - url: jdbc:postgresql://localhost:5432/production - defaultDatabase: true - roles: - - *role-admin - - *role-technicien - - *role-utilisateur - - *role-referentiel - - &db-test - name: test - url: jdbc:postgresql://localhost:5432/test - roles: - - *role-admin - - *role-technicien - - *role-utilisateur - - *role-referentiel - - *role-test -users: - - login: user1 - password: password1 - permissions: - - database: *db-production - role: *role-admin - apiAccess: PUBLIC - validationMode: PERMISSIVE - - database: *db-test - role: *role-technicien - apiAccess: PUBLIC - validationMode: PERMISSIVE - - login: user2 - password: password2 - permissions: - - database: *db-test - role: *role-referentiel - apiAccess: ALL - validationMode: NONE \ No newline at end of file ===================================== server/configuration-tools/src/test/resources/fixtures-security.yml deleted ===================================== @@ -1,45 +0,0 @@ -roles: - - &role-admin - password: passwordAdmin - - &role-technicien - password: passwordTechnicien - - &role-utilisateur - password: passwordUtilisateur - - &role-referentiel - password: passwordReferentiel - - &role-test - password: passwordTest -databases: - - &db-production - url: jdbc:postgresql://localhost:5432/production - defaultDatabase: true - roles: - - *role-admin - - *role-technicien - - *role-utilisateur - - *role-referentiel - - &db-test - url: jdbc:postgresql://localhost:5432/test - roles: - - *role-admin - - *role-technicien - - *role-utilisateur - - *role-referentiel - - *role-test -users: - - login: user1 - password: password1 - defaultApiAccess: PUBLIC - defaultValidationMode: PERMISSIVE - permissions: - - database: *db-production - role: *role-admin - - database: *db-test - role: *role-technicien - - login: user2 - password: password2 - permissions: - - database: *db-test - role: *role-referentiel - apiAccess: ALL - validationMode: NONE \ No newline at end of file ===================================== server/configuration-tools/src/test/resources/v7/databases.yml deleted ===================================== @@ -1,26 +0,0 @@ -databases: - - name: production - url: jdbc:postgresql://localhost:5432/production - defaultDatabase: true - roles: - - login: admin - password: passwordAdmin - - login: technicien - password: passwordTechnicien - - login: utilisateur - password: passwordUtilisateur - - login: referentiel - password: passwordReferentiel - - name: test - url: jdbc:postgresql://localhost:5432/test - roles: - - login: admin - password: passwordAdmin - - login: technicien - password: passwordTechnicien - - login: utilisateur - password: passwordUtilisateur - - login: referentiel - password: passwordReferentiel - - login: test - password: passwordTest \ No newline at end of file ===================================== server/configuration-tools/src/test/resources/v7/users.yml deleted ===================================== @@ -1,19 +0,0 @@ -users: - - login: user1 - password: password1 - permissions: - - database: production - role: admin - apiAccess: PUBLIC - validationMode: PERMISSIVE - - database: test - role: technicien - apiAccess: PUBLIC - validationMode: PERMISSIVE - - login: user2 - password: password2 - permissions: - - database: test - role: referentiel - apiAccess: ALL - validationMode: NONE \ No newline at end of file ===================================== server/pom.xml ===================================== @@ -31,7 +31,6 @@ <description>ObServe Server Pom</description> <modules> <module>configuration</module> - <module>configuration-tools</module> <module>core</module> <module>runner</module> </modules> ===================================== server/runner/pom.xml ===================================== @@ -221,29 +221,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>get-server-configuration-tools</id> - <goals> - <goal>unpack</goal> - </goals> - <phase>package</phase> - <configuration> - <outputDirectory>${project.build.directory}</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>server-configuration-tools</artifactId> - <version>${project.version}</version> - <type>zip</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> <inherited>false</inherited> ===================================== server/runner/src/main/assembly/server.xml ===================================== @@ -76,26 +76,5 @@ <include>${applicationName}-CHANGELOG.*</include> </includes> </fileSet> - <fileSet> - <directory>target/server-configuration-tools-${project.version}</directory> - <outputDirectory>tools</outputDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.sh</exclude> - <exclude>**/*.bat</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>target/server-configuration-tools-${project.version}</directory> - <outputDirectory>tools</outputDirectory> - <fileMode>0755</fileMode> - <filtered>true</filtered> - <includes> - <include>**/*.sh</include> - <include>**/*.bat</include> - </includes> - </fileSet> </fileSets> </assembly> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/16bd168ad28e5510fbab75982b... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/16bd168ad28e5510fbab75982b... You're receiving this email because of your account on gitlab.com.