[Observe-commits] 06/08: Introduction nouveau module pour les migrations

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c36671cd436724e2ab007ae34613c97a45a13658 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 1 15:33:26 2016 +0200 Introduction nouveau module pour les migrations --- observe-entities-migration/LICENSE.txt | 674 +++++++++++++++++++++ observe-entities-migration/README.md | 0 observe-entities-migration/pom.xml | 115 ++++ .../src/license/THIRD-PARTY.properties | 33 + .../DataSourceMigrationForVersion_3_1.java | 5 +- .../DataSourceMigrationForVersion_3_10.java | 8 +- .../DataSourceMigrationForVersion_3_11.java | 8 +- .../DataSourceMigrationForVersion_3_12.java | 8 +- .../DataSourceMigrationForVersion_3_14.java | 8 +- .../DataSourceMigrationForVersion_3_15.java | 8 +- .../DataSourceMigrationForVersion_3_16.java | 8 +- .../DataSourceMigrationForVersion_3_5.java | 8 +- .../DataSourceMigrationForVersion_3_7.java | 8 +- .../DataSourceMigrationForVersion_3_8.java | 8 +- .../DataSourceMigrationForVersion_3_9.java | 8 +- .../DataSourceMigrationForVersion_4_0.java | 8 +- .../DataSourceMigrationForVersion_4_0_1.java | 8 +- .../DataSourceMigrationForVersion_4_0_2.java | 8 +- .../DataSourceMigrationForVersion_4_0_4.java | 8 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 8 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 8 +- .../DataSourceMigrationForVersion_4_0_RC4.java | 8 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 8 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 8 +- .../DataSourceMigrationForVersion_4_900.java | 8 +- .../DataSourceMigrationForVersion_4_901.java | 8 +- .../DataSourceMigrationForVersion_4_902.java | 8 +- .../DataSourceMigrationForVersion_4_903.java | 8 +- .../DataSourceMigrationForVersion_4_904.java | 8 +- .../DataSourceMigrationForVersion_5_0.java | 8 +- .../main/java/fr/ird/type/CoordinateHelper.java | 55 ++ .../src/main/resources/db/3.5/constrainsts.csv | 0 .../resources/db/3.5/traduction_attributes.csv | 0 .../main/resources/db/3.5/traduction_tables.csv | 0 .../main/resources/db/3.5/traduction_tables2.csv | 0 .../db/migration/V3_10_01_remove-person-H2.sql | 0 .../db/migration/V3_10_01_remove-person-PG.sql | 0 .../db/migration/V3_10_02_add-missing-fk-H2.sql | 0 .../db/migration/V3_10_02_add-missing-fk-PG.sql | 0 .../V3_10_03_increase-comment-field-H2.sql | 0 .../V3_10_03_increase-comment-field-PG.sql | 0 .../migration/V3_10_04_fix-sensorDataFormat-H2.sql | 0 .../migration/V3_10_04_fix-sensorDataFormat-PG.sql | 0 .../migration/V3_10_05_normalize-sections-H2.sql | 0 .../migration/V3_10_05_normalize-sections-PG.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 0 .../db/migration/V3_11_03_add-fpaZones-H2.sql | 0 .../db/migration/V3_11_03_add-fpaZones-PG.sql | 0 .../migration/V3_11_04_add-activity-ersId-H2.sql | 0 .../migration/V3_11_04_add-activity-ersId-PG.sql | 0 .../migration/V3_11_05_add-person-country-H2.sql | 0 .../migration/V3_11_05_add-person-country-PG.sql | 0 .../db/migration/V3_11_06_add-harbours-H2.sql | 0 .../db/migration/V3_11_06_add-harbours-PG.sql | 0 .../db/migration/V3_12_01_add-missing-boat-H2.sql | 0 .../db/migration/V3_12_01_add-missing-boat-PG.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 0 ...3_14_02_fix-targetsample-discarded-value-H2.sql | 0 ...3_14_02_fix-targetsample-discarded-value-PG.sql | 0 .../V3_14_03_remove-orphan-seine-sample-H2.sql | 0 .../V3_14_03_remove-orphan-seine-sample-PG.sql | 0 ...4_04_remove-targetlength-discarded-field-H2.sql | 0 ...4_04_remove-targetlength-discarded-field-PG.sql | 0 ..._15_01_change-tdr-integer-field-to-float-H2.sql | 0 ..._15_01_change-tdr-integer-field-to-float-PG.sql | 0 ..._15_02_remove-set-longline-length-fields-H2.sql | 0 ..._15_02_remove-set-longline-length-fields-PG.sql | 0 .../V3_15_03_remove-brancheline-fields-H2.sql | 0 .../V3_15_03_remove-brancheline-fields-PG.sql | 0 .../migration/V3_16_01_add-gear-referential-H2.sql | 0 .../migration/V3_16_01_add-gear-referential-PG.sql | 0 .../db/migration/V3_16_02_add-gear-data-H2.sql | 0 .../db/migration/V3_16_02_add-gear-data-PG.sql | 0 .../V3_16_03_remove-tripSeine-seine-H2.sql | 0 .../V3_16_03_remove-tripSeine-seine-PG.sql | 0 .../db/migration/V3_5_01_migration-H2.sql | 0 .../db/migration/V3_5_01_migration-PG.sql | 0 .../migration/V3_5_02_add-longline-schema-H2.sql | 0 .../migration/V3_5_02_add-longline-schema-PG.sql | 0 .../V3_5_03_update-common-references-H2.sql | 0 .../V3_5_03_update-common-references-PG.sql | 0 .../V3_5_04_add-longline-references-H2.sql | 0 .../V3_5_04_add-longline-references-PG.sql | 0 .../db/migration/V3_7_01_rename-seine-model-H2.sql | 0 .../db/migration/V3_7_01_rename-seine-model-PG.sql | 0 .../migration/V3_7_02_remove-trip-organism-H2.sql | 0 .../migration/V3_7_02_remove-trip-organism-PG.sql | 0 .../V3_7_03_add-referential-needComment-H2.sql | 0 .../V3_7_03_add-referential-needComment-PG.sql | 0 .../V3_7_04_normalize-triplongline-H2.sql | 0 .../V3_7_04_normalize-triplongline-PG.sql | 0 .../V3_7_05_normalize-activitylongline-H2.sql | 0 .../V3_7_05_normalize-activitylongline-PG.sql | 0 .../migration/V3_7_06_normalize-setlongline-H2.sql | 0 .../migration/V3_7_06_normalize-setlongline-PG.sql | 0 .../V3_7_07_normalize-catchlongline-H2.sql | 0 .../V3_7_07_normalize-catchlongline-PG.sql | 0 .../db/migration/V3_7_08_normalize-tdr-H2.sql | 0 .../db/migration/V3_7_08_normalize-tdr-PG.sql | 0 .../db/migration/V3_7_09_add-species-list-H2.sql | 0 .../db/migration/V3_7_09_add-species-list-PG.sql | 0 .../V3_7_10_increase-comment-field-H2.sql | 0 .../V3_7_10_increase-comment-field-PG.sql | 0 .../db/migration/V3_8_01_fix-person-H2.sql | 0 .../db/migration/V3_8_01_fix-person-PG.sql | 0 .../V3_8_02_fix-branchelinecomposition-H2.sql | 0 .../V3_8_02_fix-branchelinecomposition-PG.sql | 0 .../migration/V3_8_03_normalize-sensorused-H2.sql | 0 .../migration/V3_8_03_normalize-sensorused-PG.sql | 0 .../db/migration/V3_8_04_normalize-tdr-H2.sql | 0 .../db/migration/V3_8_04_normalize-tdr-PG.sql | 0 .../V3_9_01_add-dataFilename-attribute-H2.sql | 0 .../V3_9_01_add-dataFilename-attribute-PG.sql | 0 .../migration/V3_9_02_fill-sensorDataFormat-H2.sql | 0 .../migration/V3_9_02_fill-sensorDataFormat-PG.sql | 0 .../resources/db/migration/V4_0_01_empty-H2.sql | 0 .../resources/db/migration/V4_0_01_empty-PG.sql | 0 .../V4_0_1_01_remove-gender-column-H2.sql | 0 .../db/migration/V4_0_1_02_add-missing-fk-H2.sql | 0 .../db/migration/V4_0_1_02_add-missing-fk-PG.sql | 0 .../V4_0_2_01_remove-gender-column-PG.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 0 .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 0 .../db/migration/V4_0_RC_4_01_add-gear-data-H2.sql | 0 .../db/migration/V4_0_RC_4_01_add-gear-data-PG.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 0 .../migration/V4_900_01_remove_open_field-H2.sql | 0 .../migration/V4_900_01_remove_open_field-PG.sql | 0 .../V4_901_01_add_lastUpdateDate_field-H2.sql | 0 .../V4_901_01_add_lastUpdateDate_field-PG.sql | 0 .../V4_902_01_add_lastUpdateDate_table-H2.sql | 0 .../V4_902_01_add_lastUpdateDate_table-PG.sql | 0 .../migration/V4_903_01_remove_unit_field-H2.sql | 0 .../migration/V4_903_01_remove_unit_field-PG.sql | 0 .../migration/V4_903_02_remove_gender_field-H2.sql | 0 .../migration/V4_903_02_remove_gender_field-PG.sql | 0 .../V4_903_03_remove_duplicate_rows-H2.sql | 0 .../V4_903_03_remove_duplicate_rows-PG.sql | 0 ...drop_not_null_constraint_gearUseFeatures-H2.sql | 0 ...drop_not_null_constraint_gearUseFeatures-PG.sql | 0 ...rveMigrationCallBackForVersionResolverTest.java | 6 +- .../src/test/resources/log4j.properties | 33 + observe-entities/pom.xml | 5 - .../observe/ObserveTopiaApplicationContext.java | 6 +- .../migration/AbstractDataSourceMigration.java | 65 +- .../entities/migration/MigrationVersions.java | 87 +++ ...ObserveMigrationCallBackForVersionResolver.java | 2 +- .../ObserveTopiaApplicationContextTest.java | 109 ---- .../validation => }/RelationRegexTest.java | 2 +- observe-services-topia/pom.xml | 6 + .../services/service/DataSourceServiceTopia.java | 3 +- .../ird/observe/services/DataSourceResource.java | 4 +- .../service/DataSourceServiceTopiaTest.java | 8 +- .../fr/ird/observe/services/service/RigthTest.java | 4 +- pom.xml | 1 + 171 files changed, 1080 insertions(+), 343 deletions(-) diff --git a/observe-entities-migration/LICENSE.txt b/observe-entities-migration/LICENSE.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/observe-entities-migration/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://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 <http://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 +<http://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 +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/observe-entities-migration/README.md b/observe-entities-migration/README.md new file mode 100644 index 0000000..e69de29 diff --git a/observe-entities-migration/pom.xml b/observe-entities-migration/pom.xml new file mode 100644 index 0000000..503330d --- /dev/null +++ b/observe-entities-migration/pom.xml @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Business + + $HeadURL: https://svn.mpl.ird.fr/osiris/observe/trunk/observe-business/pom.xml $ + %% + 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 Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-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>observe</artifactId> + <version>5.0-SNAPSHOT</version> + </parent> + + <artifactId>observe-entities-migration</artifactId> + + <name>ObServe :: Entities Migration</name> + <description>ObServe entities migration module</description> + + <dependencies> + + <!-- sibling dependencies --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-entities</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- Nuiton --> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + </dependency> + + <!-- commons --> + <dependency> + <groupId> org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <!-- ToPIA --> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + </dependency> + + <!-- test --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + + </dependencies> + +</project> diff --git a/observe-entities-migration/src/license/THIRD-PARTY.properties b/observe-entities-migration/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..e7f6efe --- /dev/null +++ b/observe-entities-migration/src/license/THIRD-PARTY.properties @@ -0,0 +1,33 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 +# - Apache Software License, version 1.1 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Library or Lesser General Public License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - Public Domain +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Aug 26 01:19:49 CEST 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_1.java similarity index 96% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_1.java index 3775113..d5a0d4b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_1.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -24,6 +24,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.entities.migration.MigrationVersions; import org.apache.commons.lang3.tuple.Pair; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -45,7 +46,7 @@ import java.util.List; public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_1(AbstractDataSourceMigration callBack) { - super(AbstractDataSourceMigration.V_3_1, callBack, ""); + super(MigrationVersions.V_3_1.getVersion(), callBack, ""); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_10.java similarity index 84% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_10.java index b858695..2274c41 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_10.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public class DataSourceMigrationForVersion_3_10 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_10(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_10, callBack, scriptSuffix); + super(MigrationVersions.V_3_10.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_11.java similarity index 85% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_11.java index 44d1ed0..8b2f3e7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_11.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public class DataSourceMigrationForVersion_3_11 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_11(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_11, callBack, scriptSuffix); + super(MigrationVersions.V_3_11.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_12.java similarity index 83% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_12.java index 813d7de..7c25f26 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_12.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public class DataSourceMigrationForVersion_3_12 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_12(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_12, callBack, scriptSuffix); + super(MigrationVersions.V_3_12.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_14.java similarity index 84% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_14.java index 2192843..479f72d 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_14.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public class DataSourceMigrationForVersion_3_14 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_14(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_14, callBack, scriptSuffix); + super(MigrationVersions.V_3_14.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_15.java similarity index 84% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_15.java index 2e7541a..9c89d04 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_15.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public class DataSourceMigrationForVersion_3_15 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_15(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_15, callBack, scriptSuffix); + super(MigrationVersions.V_3_15.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_16.java similarity index 94% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_16.java index d30c97a..b03a7df 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_16.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -49,7 +45,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_3_16.class); public DataSourceMigrationForVersion_3_16(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_16, callBack, scriptSuffix); + super(MigrationVersions.V_3_16.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_5.java similarity index 95% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_5.java index ea5102f..beb41ed 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_5.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -91,7 +87,7 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM }; public DataSourceMigrationForVersion_3_5(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_5, callBack, scriptSuffix); + super(MigrationVersions.V_3_5.getVersion(), callBack, scriptSuffix); } protected abstract void removeFK(TopiaSqlSupport tx, String tableName, List<String> queries) throws TopiaException; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_7.java similarity index 86% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_7.java index 8b21f9b..1645adf 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_7.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public abstract class DataSourceMigrationForVersion_3_7 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_7(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_7, callBack, scriptSuffix); + super(MigrationVersions.V_3_7.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_8.java similarity index 84% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_8.java index 9212ab2..371f9e8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_8.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public class DataSourceMigrationForVersion_3_8 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_8(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_8, callBack, scriptSuffix); + super(MigrationVersions.V_3_8.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_9.java similarity index 84% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_9.java index f5a11a7..76aa2a9 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_3_9.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public class DataSourceMigrationForVersion_3_9 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_9(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_3_9, callBack, scriptSuffix); + super(MigrationVersions.V_3_9.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0.java similarity index 83% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0.java index 71214ca..adf8056 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public class DataSourceMigrationForVersion_4_0 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_0, callBack, scriptSuffix); + super(MigrationVersions.V_4_0.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_1.java similarity index 95% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_1.java index 6c47bfd..5d2ade9 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_1.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -25,10 +25,6 @@ package fr.ird.observe.entities.migration.versions; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; import fr.ird.observe.ObserveTopiaIdFactory; -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import org.nuiton.topia.persistence.TopiaException; @@ -51,7 +47,7 @@ import java.util.Set; public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_1(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_0_1, callBack, scriptSuffix); + super(MigrationVersions.V_4_0_1.getVersion(), callBack, scriptSuffix); } protected abstract void removeForeignKeys(TopiaSqlSupport tx, List<String> queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_2.java similarity index 84% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_2.java index 79be582..e10115b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public abstract class DataSourceMigrationForVersion_4_0_2 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_2(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_0_2, callBack, scriptSuffix); + super(MigrationVersions.V_4_0_2.getVersion(), callBack, scriptSuffix); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_2 { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_4.java similarity index 83% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_4.java index df23d87..2c5be0b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_4.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -40,7 +36,7 @@ import java.util.List; public abstract class DataSourceMigrationForVersion_4_0_4 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_4(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_0_4, callBack, scriptSuffix); + super(MigrationVersions.V_4_0_4.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC2.java similarity index 88% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC2.java index 527f753..dbe53fc 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.sql.PreparedStatement; @@ -44,7 +40,7 @@ import java.util.Set; public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC2(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_0_RC2, callBack, scriptSuffix); + super(MigrationVersions.V_4_0_RC2.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC3.java similarity index 96% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC3.java index 2f92da3..a104685 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC3.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; @@ -53,7 +49,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_4_0_RC3.class); public DataSourceMigrationForVersion_4_0_RC3(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_0_RC3, callBack, scriptSuffix); + super(MigrationVersions.V_4_0_RC3.getVersion(), callBack, scriptSuffix); } protected abstract void addMissingForeignKeys(TopiaSqlSupport tx, List<String> queries) throws TopiaException; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC4.java similarity index 83% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC4.java index ca8f1c3..b7fc613 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC4.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public class DataSourceMigrationForVersion_4_0_RC4 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC4(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_0_RC4, callBack, scriptSuffix); + super(MigrationVersions.V_4_0_RC4.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC6.java similarity index 87% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC6.java index 776807f..3f5d6c3 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC6.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC6(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_0_RC6, callBack, scriptSuffix); + super(MigrationVersions.V_4_0_RC6.getVersion(), callBack, scriptSuffix); } protected abstract void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC7.java similarity index 85% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC7.java index 539b6fd..7b0b3f7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_0_RC7.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public abstract class DataSourceMigrationForVersion_4_0_RC7 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC7(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_0_RC7, callBack, scriptSuffix); + super(MigrationVersions.V_4_0_RC7.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_900.java similarity index 84% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_900.java index 99ad967..f8a3ccc 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_900.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -38,7 +34,7 @@ import java.util.List; public class DataSourceMigrationForVersion_4_900 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_900(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_900, callBack, scriptSuffix); + super(MigrationVersions.V_4_900.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_901.java similarity index 84% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_901.java index aed7b16..7a5b699 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_901.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -38,7 +34,7 @@ import java.util.List; public class DataSourceMigrationForVersion_4_901 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_901(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_901, callBack, scriptSuffix); + super(MigrationVersions.V_4_901.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_902.java similarity index 84% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_902.java index bf171c1..63d05f7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_902.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -38,7 +34,7 @@ import java.util.List; public class DataSourceMigrationForVersion_4_902 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_902(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_902, callBack, scriptSuffix); + super(MigrationVersions.V_4_902.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_903.java similarity index 84% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_903.java index afc4088..055bc2e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_903.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -38,7 +34,7 @@ import java.util.List; public class DataSourceMigrationForVersion_4_903 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_903(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_903, callBack, scriptSuffix); + super(MigrationVersions.V_4_903.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_904.java similarity index 83% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_904.java index 5861592..607b8aa 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_4_904.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -38,7 +34,7 @@ import java.util.List; public class DataSourceMigrationForVersion_4_904 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_904(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_4_904, callBack, scriptSuffix); + super(MigrationVersions.V_4_904.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java similarity index 83% rename from observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java rename to observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java index 6775e05..c0ac8b8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java +++ b/observe-entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; /* * #%L @@ -22,10 +22,6 @@ package fr.ird.observe.entities.migration.versions; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; @@ -39,7 +35,7 @@ import java.util.List; public class DataSourceMigrationForVersion_5_0 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_5_0(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(AbstractDataSourceMigration.V_5_0, callBack, scriptSuffix); + super(MigrationVersions.V_5_0.getVersion(), callBack, scriptSuffix); } @Override diff --git a/observe-entities-migration/src/main/java/fr/ird/type/CoordinateHelper.java b/observe-entities-migration/src/main/java/fr/ird/type/CoordinateHelper.java new file mode 100644 index 0000000..5a519ab --- /dev/null +++ b/observe-entities-migration/src/main/java/fr/ird/type/CoordinateHelper.java @@ -0,0 +1,55 @@ +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2010 - 2011 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% + */ +package fr.ird.type; + +/** + * Helper to deal with coordinates. + * + * @author tchemit - chemit@codelutin.com + * @since 1.2 + */ +public class CoordinateHelper { + + /** + * Calcule le quadrant à partir d'une {@code longitude} et {@code latitude}. + * + * @param longitude la longitude décimale + * @param latitude la latitude décimale + * @return la valeur du quadrant ou {@code null} si l'une des deux + * coordonnées est {@code null}. + * @since 1.2 + */ + public static Integer getQuadrant(Float longitude, Float latitude) { + if (longitude == null || latitude == null) { + return null; + } + int result; + + if (latitude > 0) { + result = longitude > 0 ? 1 : 4; + } else { + result = longitude > 0 ? 2 : 3; + } + return result; + } + +} diff --git a/observe-entities/src/main/resources/db/3.5/constrainsts.csv b/observe-entities-migration/src/main/resources/db/3.5/constrainsts.csv similarity index 100% rename from observe-entities/src/main/resources/db/3.5/constrainsts.csv rename to observe-entities-migration/src/main/resources/db/3.5/constrainsts.csv diff --git a/observe-entities/src/main/resources/db/3.5/traduction_attributes.csv b/observe-entities-migration/src/main/resources/db/3.5/traduction_attributes.csv similarity index 100% rename from observe-entities/src/main/resources/db/3.5/traduction_attributes.csv rename to observe-entities-migration/src/main/resources/db/3.5/traduction_attributes.csv diff --git a/observe-entities/src/main/resources/db/3.5/traduction_tables.csv b/observe-entities-migration/src/main/resources/db/3.5/traduction_tables.csv similarity index 100% rename from observe-entities/src/main/resources/db/3.5/traduction_tables.csv rename to observe-entities-migration/src/main/resources/db/3.5/traduction_tables.csv diff --git a/observe-entities/src/main/resources/db/3.5/traduction_tables2.csv b/observe-entities-migration/src/main/resources/db/3.5/traduction_tables2.csv similarity index 100% rename from observe-entities/src/main/resources/db/3.5/traduction_tables2.csv rename to observe-entities-migration/src/main/resources/db/3.5/traduction_tables2.csv diff --git a/observe-entities/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_5_01_migration-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_5_01_migration-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_5_01_migration-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_5_01_migration-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_5_01_migration-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_5_01_migration-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_5_01_migration-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_5_01_migration-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_01_empty-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_01_empty-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_01_empty-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_01_empty-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_01_empty-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_01_empty-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_01_empty-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_01_empty-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql b/observe-entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql diff --git a/observe-entities/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql b/observe-entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql similarity index 100% rename from observe-entities/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql rename to observe-entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql diff --git a/observe-entities/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java b/observe-entities-migration/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java similarity index 91% rename from observe-entities/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java rename to observe-entities-migration/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java index 9a20b47..ede5b24 100644 --- a/observe-entities/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java +++ b/observe-entities-migration/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java @@ -41,7 +41,7 @@ public class ObserveMigrationCallBackForVersionResolverTest { = new ObserveMigrationCallBackForVersionResolver("H2"); Assert.assertNotNull(resolver); - for (Version version : AbstractDataSourceMigration.availableVersions) { + for (Version version : MigrationVersions.getAvailableVersions()) { Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion> callBack = resolver.getCallBack(version); Assert.assertNotNull(callBack); } @@ -52,7 +52,7 @@ public class ObserveMigrationCallBackForVersionResolverTest { ObserveMigrationCallBackForVersionResolver resolver = new ObserveMigrationCallBackForVersionResolver("PG"); Assert.assertNotNull(resolver); - for (Version version : AbstractDataSourceMigration.availableVersions) { + for (Version version : MigrationVersions.getAvailableVersions()) { Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion> callBack = resolver.getCallBack(version); Assert.assertNotNull(callBack); } @@ -63,7 +63,7 @@ public class ObserveMigrationCallBackForVersionResolverTest { ObserveMigrationCallBackForVersionResolver resolver = new ObserveMigrationCallBackForVersionResolver("Dummy"); Assert.assertNotNull(resolver); - for (Version version : AbstractDataSourceMigration.availableVersions) { + for (Version version : MigrationVersions.getAvailableVersions()) { Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion> callBack = resolver.getCallBack(version); Assert.assertNotNull(callBack); } diff --git a/observe-entities-migration/src/test/resources/log4j.properties b/observe-entities-migration/src/test/resources/log4j.properties new file mode 100644 index 0000000..434cab6 --- /dev/null +++ b/observe-entities-migration/src/test/resources/log4j.properties @@ -0,0 +1,33 @@ +### +# #%L +# ObServe :: Entities +# %% +# 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% +### + +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n + +# package level +log4j.logger.fr.ird.observe=INFO +log4j.logger.org.nuiton.topia=INFO +log4j.logger.jaxx.runtime.decorator=INFO diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 862026c..c0eefb2 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -41,11 +41,6 @@ <!-- sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-test-data</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>observe-topia-extension</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index a22a85c..e2ea4da 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -87,7 +87,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat public ObserveTopiaApplicationContext(ObserveTopiaConfiguration topiaConfiguration) { super(topiaConfiguration); this.authenticationToken = UUID.randomUUID().toString(); - this.topiaMetadataModelSupport = new TopiaMetadataModelSupportImpl("fr.ird.observe","Observe"); + this.topiaMetadataModelSupport = new TopiaMetadataModelSupportImpl("fr.ird.observe", "Observe"); this.topiaSqlTablesFactory = new TopiaSqlTablesFactory(getMetadataModel(), this); } @@ -141,8 +141,8 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat try (ObserveTopiaPersistenceContext topiaPersistenceContext = newPersistenceContext()) { String sql = Stream.concat(Entities.REFERENCE_ENTITIES_LIST.stream(), Entities.DATA_ENTITIES_LIST.stream()) - .map(entity -> String.format(INSERT_LAST_UPDATE_PATTERN, entity.ordinal(), entity.getContract().getCanonicalName())) - .collect(Collectors.joining("\n")); + .map(entity -> String.format(INSERT_LAST_UPDATE_PATTERN, entity.ordinal(), entity.getContract().getCanonicalName())) + .collect(Collectors.joining("\n")); topiaPersistenceContext.getSqlSupport().executeSql(sql); topiaPersistenceContext.commit(); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 4bbbe28..25e58c8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -27,7 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.version.Version; -import org.nuiton.version.Versions; import java.util.List; @@ -39,63 +38,14 @@ import java.util.List; */ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallbackByClass { - /** - * Logger - */ - private static final Log log = - LogFactory.getLog(AbstractDataSourceMigration.class); - - public static final Version V_3_0 = Versions.valueOf("3.0"); - public static final Version V_3_1 = Versions.valueOf("3.1"); - public static final Version V_3_5 = Versions.valueOf("3.5"); - public static final Version V_3_7 = Versions.valueOf("3.7"); - public static final Version V_3_8 = Versions.valueOf("3.8"); - public static final Version V_3_9 = Versions.valueOf("3.9"); - public static final Version V_3_10 = Versions.valueOf("3.10"); - public static final Version V_3_11 = Versions.valueOf("3.11"); - public static final Version V_3_12 = Versions.valueOf("3.12"); - public static final Version V_3_14 = Versions.valueOf("3.14"); - public static final Version V_3_15 = Versions.valueOf("3.15"); - public static final Version V_3_16 = Versions.valueOf("3.16"); - - public static final Version V_4_0_RC2 = Versions.valueOf("4.0-RC2"); - public static final Version V_4_0_RC3 = Versions.valueOf("4.0-RC3"); - public static final Version V_4_0_RC4 = Versions.valueOf("4.0-RC4"); - public static final Version V_4_0_RC6 = Versions.valueOf("4.0-RC6"); - public static final Version V_4_0_RC7 = Versions.valueOf("4.0-RC7"); - - public static final Version V_4_0 = Versions.valueOf("4.0"); - public static final Version V_4_0_1 = Versions.valueOf("4.0.1"); - public static final Version V_4_0_2 = Versions.valueOf("4.0.2"); - public static final Version V_4_0_4 = Versions.valueOf("4.0.4"); - - public static final Version V_4_900 = Versions.valueOf("4.900"); - public static final Version V_4_901 = Versions.valueOf("4.901"); - public static final Version V_4_902 = Versions.valueOf("4.902"); - public static final Version V_4_903 = Versions.valueOf("4.903"); - public static final Version V_4_904 = Versions.valueOf("4.904"); - - // FIXME A utiliser en version final 5.0 - public static final Version V_5_0 = Versions.valueOf("5.0"); - - /** - * Les versions de mise à jour disponibles. - */ - public static final Version[] availableVersions = new Version[]{ - V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16, V_4_0_RC2, - V_4_0_RC3, V_4_0_RC4, V_4_0_RC6, V_4_0_RC7, V_4_0, V_4_0_1, V_4_0_2, V_4_0_4, - V_4_900, V_4_901, V_4_902, V_4_903, V_4_904 - // FIXME A utiliser en version final 5.0 - //V_5_0 - - }; - + /** Logger. */ + private static final Log log = LogFactory.getLog(AbstractDataSourceMigration.class); public static ImmutableList<Version> getVersionsAfter(Version current) { ImmutableList.Builder<Version> builder = ImmutableList.builder(); - for (Version version : availableVersions) { + for (Version version : MigrationVersions.getAvailableVersions()) { if (version.after(current)) { @@ -117,22 +67,17 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback @Override public Version[] getAvailableVersions() { - return availableVersions; + return MigrationVersions.getAvailableVersions(); } - @Override public boolean askUser(Version dbVersion, List<Version> versions) { // on autorise les migrations dès quelles sont demandée pour une version égale ou superieur à la V3.0. - return dbVersion.afterOrEquals(V_3_0); + return dbVersion.afterOrEquals(MigrationVersions.getMinimumVersion()); } public void setTopiaApplicationContext(ObserveTopiaApplicationContext topiaApplicationContext) { this.topiaApplicationContext = topiaApplicationContext; } - public static Version getLastVersion() { - int lastIndex = availableVersions.length - 1; - return availableVersions[lastIndex]; - } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/MigrationVersions.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/MigrationVersions.java new file mode 100644 index 0000000..a6e8f06 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/MigrationVersions.java @@ -0,0 +1,87 @@ +package fr.ird.observe.entities.migration; + +import org.nuiton.version.Version; +import org.nuiton.version.Versions; + +import java.util.LinkedHashSet; +import java.util.Set; + +/** + * Created on 01/08/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.0 + */ +public enum MigrationVersions { + + V_3_0("3.0", false), + V_3_1("3.1"), + V_3_5("3.5"), + V_3_7("3.7"), + V_3_8("3.8"), + V_3_9("3.9"), + V_3_10("3.10"), + V_3_11("3.11"), + V_3_12("3.12"), + V_3_14("3.14"), + V_3_15("3.15"), + V_3_16("3.16"), + V_4_0_RC2("4.0-RC2"), + V_4_0_RC3("4.0-RC3"), + V_4_0_RC4("4.0-RC4"), + V_4_0_RC6("4.0-RC6"), + V_4_0_RC7("4.0-RC7"), + V_4_0("4.0"), + V_4_0_1("4.0.1"), + V_4_0_2("4.0.2"), + V_4_0_4("4.0.4"), + V_4_900("4.900"), + V_4_901("4.901"), + V_4_902("4.902"), + V_4_903("4.903"), + V_4_904("4.904"), + + // FIXME A utiliser en version final 5.0 + V_5_0("5.0", false); + + private static Version[] AVAILABLE_VERSIONS; + + private final Version version; + private final boolean canApply; + + MigrationVersions(String versionAsString, boolean canApply) { + this.version = Versions.valueOf(versionAsString); + this.canApply = canApply; + } + + MigrationVersions(String versionAsString) { + this(versionAsString, true); + } + + public Version getVersion() { + return version; + } + + public static Version[] getAvailableVersions() { + if (AVAILABLE_VERSIONS == null) { + Set<Version> result = new LinkedHashSet<>(); + for (MigrationVersions migrationVersions : values()) { + if (migrationVersions.canApply) { + result.add(migrationVersions.getVersion()); + } + } + AVAILABLE_VERSIONS = result.toArray(new Version[result.size()]); + } + return AVAILABLE_VERSIONS; + } + + public static Version getLastVersion() { + Version[] values = getAvailableVersions(); + int lastIndex = values.length - 1; + return values[lastIndex]; + } + + public static Version getMinimumVersion() { + return V_3_0.getVersion(); + } +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java index 10ee36b..0e440ee 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java @@ -51,7 +51,7 @@ class ObserveMigrationCallBackForVersionResolver implements TopiaMigrationCallba @Override public Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion> getCallBack(Version version) { - String mainclassName = getClass().getPackage().getName() + ".versions.DataSourceMigrationForVersion_" + version.getValidName(); + String mainclassName = getClass().getPackage().getName() + ".DataSourceMigrationForVersion_" + version.getValidName(); Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion> result = null; try { Class<?> mainClass = Class.forName(mainclassName); diff --git a/observe-entities/src/test/java/fr/ird/observe/ObserveTopiaApplicationContextTest.java b/observe-entities/src/test/java/fr/ird/observe/ObserveTopiaApplicationContextTest.java deleted file mode 100644 index fded7d4..0000000 --- a/observe-entities/src/test/java/fr/ird/observe/ObserveTopiaApplicationContextTest.java +++ /dev/null @@ -1,109 +0,0 @@ -package fr.ird.observe; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2015 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% - */ - -import fr.ird.observe.test.TestHelper; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; -import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; -import org.nuiton.topia.persistence.metadata.TopiaMetadataModelVisitor; - -import java.io.File; - -/** - * Created on 23/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ObserveTopiaApplicationContextTest { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ObserveTopiaApplicationContextTest.class); - - @Rule - public final TestName testName = new TestName(); - - protected File testDirectory; - - @BeforeClass - public static void setUpClass() throws Exception { - - TestHelper.initTest(ObserveTopiaApplicationContextTest.class); - } - - @Before - public void setUp() { - testDirectory = TestHelper.newFile(testName.getMethodName()); - } - - @Test - public void testOpenEmptyDatabase() { - - File dbDirectory = new File(testDirectory, "db"); - - if (log.isInfoEnabled()) { - log.info("database directory: " + dbDirectory); - } - - ObserveTopiaConfiguration topiaConfiguration = ObserveTopiaConfigurationFactory.forH2Database( - dbDirectory, - "obstuna", - TestHelper.TEST_H2_LOGIN, - String.valueOf(TestHelper.TEST_H2_PASSWORD), - true, - true, - true - ); - - ObserveTopiaApplicationContext topiaApplicationContext = new ObserveTopiaApplicationContext(topiaConfiguration); - - try (ObserveTopiaPersistenceContext topiaPersistenceContext = topiaApplicationContext.newPersistenceContext()) { - - TestHelper.assertSchemaCreated(topiaApplicationContext, topiaPersistenceContext, false); - - } - - TopiaMetadataModel metadataModel = topiaApplicationContext.getMetadataModel(); - - { - TopiaMetadataModelVisitor.PrintVisitor printVisitor = new TopiaMetadataModelVisitor.PrintVisitor(true, "\n"); - - metadataModel.getEntity(ObserveEntityEnum.TripSeine.name()).accept(printVisitor, metadataModel); - - log.info("TripSeine shell:\n" + printVisitor.toString()); - } - - { - TopiaMetadataModelVisitor.PrintVisitor printVisitor = new TopiaMetadataModelVisitor.PrintVisitor(true, "\n"); - - metadataModel.getEntity(ObserveEntityEnum.TripLongline.name()).accept(printVisitor, metadataModel); - - log.info("TripLongline shell:\n" + printVisitor.toString()); - } - } -} \ No newline at end of file diff --git a/observe-entities/src/test/java/fr/ird/observe/business/validation/RelationRegexTest.java b/observe-entities/src/test/java/fr/ird/observe/RelationRegexTest.java similarity index 98% rename from observe-entities/src/test/java/fr/ird/observe/business/validation/RelationRegexTest.java rename to observe-entities/src/test/java/fr/ird/observe/RelationRegexTest.java index 953eb41..cee74db 100644 --- a/observe-entities/src/test/java/fr/ird/observe/business/validation/RelationRegexTest.java +++ b/observe-entities/src/test/java/fr/ird/observe/RelationRegexTest.java @@ -20,7 +20,7 @@ * #L% */ -package fr.ird.observe.business.validation; +package fr.ird.observe; import org.junit.Assert; import org.junit.Test; diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index 69f9963..497ce95 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -45,6 +45,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>observe-entities-migration</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>observe-services-topia-validation</artifactId> <version>${project.version}</version> <scope>runtime</scope> diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java index b29ff3c..d5cfa7b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java @@ -31,6 +31,7 @@ import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaConfiguration; import fr.ird.observe.ObserveTopiaConfigurationFactory; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; +import fr.ird.observe.entities.migration.MigrationVersions; import fr.ird.observe.services.ObserveJdbcHelper; import fr.ird.observe.services.ObserveSecurityHelper; import fr.ird.observe.services.ObserveServiceTopia; @@ -586,7 +587,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS writeReferential, readData, writeData, - AbstractDataSourceMigration.V_3_0, + MigrationVersions.getMinimumVersion(), version, AbstractDataSourceMigration.getVersionsAfter(version)); return information; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java index d6302e1..614742d 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java @@ -26,7 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; +import fr.ird.observe.entities.migration.MigrationVersions; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; @@ -233,7 +233,7 @@ public class DataSourceResource implements TestRule { configurationTopiaH2.setDirectory(localDbFile); configurationTopiaH2.setDbName("obstuna"); configurationTopiaH2.setAutoMigrate(true); - configurationTopiaH2.setModelVersion(AbstractDataSourceMigration.getLastVersion()); + configurationTopiaH2.setModelVersion(MigrationVersions.getLastVersion()); return configurationTopiaH2; } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java index f5d5614..da3e600 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.entities.migration.H2DataSourceMigration; +import fr.ird.observe.entities.migration.MigrationVersions; import fr.ird.observe.services.ObserveTopiaApplicationContextFactory; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; @@ -175,7 +175,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void testCreateDataSourceFromImportDatabase() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException { - String scriptPath = applicationContextResource.getScriptPath("referentiel", H2DataSourceMigration.V_4_0); + String scriptPath = applicationContextResource.getScriptPath("referentiel", MigrationVersions.V_4_0.getVersion()); byte[] dumpContent = TestHelper.getResourceContent(scriptPath); @@ -193,7 +193,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { public void testCreateDataSourceFromImportReferential() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { // On crée un base qui fait office de source de référentiel - String scriptPath = applicationContextResource.getScriptPath("referentiel", H2DataSourceMigration.V_4_0_1); + String scriptPath = applicationContextResource.getScriptPath("referentiel", MigrationVersions.V_4_0_1.getVersion()); dataSourceResource.createDataSourceFromScript(scriptPath); ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); @@ -217,7 +217,7 @@ public class DataSourceServiceTopiaTest extends AbstractServiceTopiaTest { public void testCreateDataSourceFromImportReferentialAndData() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { // On crée un base qui fait office de source de référentiel et de source de données (uniquement des données seine) - String scriptPath = applicationContextResource.getScriptPath("dataForTestSeine", H2DataSourceMigration.V_4_0_1); + String scriptPath = applicationContextResource.getScriptPath("dataForTestSeine", MigrationVersions.V_4_0_1.getVersion()); dataSourceResource.createDataSourceFromScript(scriptPath); ObserveDataSourceConfigurationTopiaH2 dataSourceConfiguration = dataSourceResource.getDataSourceConfiguration(); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java index b10d4bd..a209ddd 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.service; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; +import fr.ird.observe.entities.migration.MigrationVersions; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceContextTopia; import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; @@ -91,7 +91,7 @@ public class RigthTest { configurationTopiaPG.setUsername(login); configurationTopiaPG.setPassword('a'); configurationTopiaPG.setAutoMigrate(true); - configurationTopiaPG.setModelVersion(AbstractDataSourceMigration.getLastVersion()); + configurationTopiaPG.setModelVersion(MigrationVersions.getLastVersion()); return configurationTopiaPG; diff --git a/pom.xml b/pom.xml index 959f874..e28224b 100644 --- a/pom.xml +++ b/pom.xml @@ -91,6 +91,7 @@ <module>observe-services-api</module> <module>observe-test-data</module> <module>observe-entities</module> + <module>observe-entities-migration</module> <module>observe-services-topia-validation</module> <module>observe-services-topia</module> <module>observe-services-rest</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.