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 eab0e116c63ffd4a4486daea29d359f2d1bbe101 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 08:42:38 2016 +0100 Introduce services-topia-binder module --- pom.xml | 1 + services-topia-binder/LICENSE.txt | 674 +++++++++++++++++++++ services-topia-binder/README.md | 2 + services-topia-binder/pom.xml | 78 +++ .../services/topia/binder/BinderEngine.java | 0 .../topia/binder/BinderEngineInitializer.java | 0 .../services/topia/binder/BinderSupport.java | 0 .../binder/ReferenceBinderEngineSupplierTopia.java | 0 .../topia/binder/data/ActivityLonglineBinder.java | 0 .../data/ActivityLonglineEncouterDtoBinder.java | 0 .../data/ActivityLonglineSensorUsedDtoBinder.java | 0 .../binder/data/ActivityLonglineStubDtoBinder.java | 0 .../topia/binder/data/ActivitySeineBinder.java | 0 .../binder/data/ActivitySeineStubDtoBinder.java | 0 .../topia/binder/data/BaitsCompositionBinder.java | 0 .../services/topia/binder/data/BasketBinder.java | 0 .../topia/binder/data/BranchlineBinder.java | 0 .../binder/data/BranchlinesCompositionBinder.java | 0 .../topia/binder/data/CatchLonglineBinder.java | 0 .../topia/binder/data/DataBinderSupport.java | 0 .../topia/binder/data/EncounterBinder.java | 0 .../topia/binder/data/FloatingObjectBinder.java | 0 .../FloatingObjectObservedSpeciesDtoBinder.java | 0 .../FloatingObjectSchoolEstimateDtoBinder.java | 0 .../FloatingObjectTransmittingBuoyDtoBinder.java | 0 .../binder/data/FloatlinesCompositionBinder.java | 0 .../binder/data/GearUseFeaturesLonglineBinder.java | 0 .../GearUseFeaturesMeasurementLonglineBinder.java | 0 .../GearUseFeaturesMeasurementSeineBinder.java | 0 .../binder/data/GearUseFeaturesSeineBinder.java | 0 .../topia/binder/data/HooksCompositionBinder.java | 0 .../topia/binder/data/NonTargetCatchBinder.java | 0 .../topia/binder/data/NonTargetLengthBinder.java | 0 .../topia/binder/data/NonTargetSampleBinder.java | 0 .../binder/data/ObjectObservedSpeciesBinder.java | 0 .../binder/data/ObjectSchoolEstimateBinder.java | 0 .../services/topia/binder/data/RouteBinder.java | 0 .../topia/binder/data/RouteStubDtoBinder.java | 0 .../topia/binder/data/SchoolEstimateBinder.java | 0 .../services/topia/binder/data/SectionBinder.java | 0 .../topia/binder/data/SensorUsedBinder.java | 0 .../topia/binder/data/SetLonglineBinder.java | 0 .../binder/data/SetLonglineCatchDtoBinder.java | 0 .../SetLonglineDetailCompositionDtoBinder.java | 0 .../SetLonglineGlobalCompositionDtoBinder.java | 0 .../binder/data/SetLonglineStubDtoBinder.java | 0 .../topia/binder/data/SetLonglineTdrDtoBinder.java | 0 .../services/topia/binder/data/SetSeineBinder.java | 0 .../data/SetSeineNonTargetCatchDtoBinder.java | 0 .../data/SetSeineSchoolEstimateDtoBinder.java | 0 .../binder/data/SetSeineTargetCatchDtoBinder.java | 0 .../topia/binder/data/SizeMeasureBinder.java | 0 .../topia/binder/data/TargetCatchBinder.java | 0 .../topia/binder/data/TargetLengthBinder.java | 0 .../topia/binder/data/TargetSampleBinder.java | 0 .../services/topia/binder/data/TdrBinder.java | 0 .../topia/binder/data/TransmittingBuoyBinder.java | 0 .../binder/data/TripLonglineActivityDtoBinder.java | 0 .../topia/binder/data/TripLonglineBinder.java | 0 .../binder/data/TripLonglineGearUseDtoBinder.java | 0 .../topia/binder/data/TripSeineBinder.java | 0 .../binder/data/TripSeineGearUseDtoBinder.java | 0 .../topia/binder/data/WeightMeasureBinder.java | 0 .../referential/BaitHaulingStatusBinder.java | 0 .../referential/BaitSettingStatusBinder.java | 0 .../topia/binder/referential/BaitTypeBinder.java | 0 .../referential/CatchFateLonglineBinder.java | 0 .../topia/binder/referential/CountryBinder.java | 0 .../binder/referential/DetectionModeBinder.java | 0 .../binder/referential/EncounterTypeBinder.java | 0 .../topia/binder/referential/FpaZoneBinder.java | 0 .../topia/binder/referential/GearBinder.java | 0 .../referential/GearCaracteristicBinder.java | 0 .../referential/GearCaracteristicTypeBinder.java | 0 .../topia/binder/referential/HarbourBinder.java | 0 .../topia/binder/referential/HealthnessBinder.java | 0 .../binder/referential/HookPositionBinder.java | 0 .../topia/binder/referential/HookSizeBinder.java | 0 .../topia/binder/referential/HookTypeBinder.java | 0 .../referential/ItemHorizontalPositionBinder.java | 0 .../referential/ItemVerticalPositionBinder.java | 0 .../referential/LengthWeightParameterBinder.java | 0 .../binder/referential/LightsticksColorBinder.java | 0 .../binder/referential/LightsticksTypeBinder.java | 0 .../topia/binder/referential/LineTypeBinder.java | 0 .../binder/referential/MaturityStatusBinder.java | 0 .../binder/referential/MitigationTypeBinder.java | 0 .../topia/binder/referential/ObjectFateBinder.java | 0 .../binder/referential/ObjectOperationBinder.java | 0 .../topia/binder/referential/ObjectTypeBinder.java | 0 .../binder/referential/ObservedSystemBinder.java | 0 .../topia/binder/referential/OceanBinder.java | 0 .../topia/binder/referential/OrganismBinder.java | 0 .../topia/binder/referential/PersonBinder.java | 0 .../topia/binder/referential/ProgramBinder.java | 0 .../binder/referential/ReasonForDiscardBinder.java | 0 .../referential/ReasonForNoFishingBinder.java | 0 .../binder/referential/ReasonForNullSetBinder.java | 0 .../referential/ReferentialBinderSupport.java | 0 .../binder/referential/SensorBrandBinder.java | 0 .../binder/referential/SensorDataFormatBinder.java | 0 .../topia/binder/referential/SensorTypeBinder.java | 0 .../binder/referential/SettingShapeBinder.java | 0 .../topia/binder/referential/SexBinder.java | 0 .../topia/binder/referential/ShipOwnerBinder.java | 0 .../binder/referential/SizeMeasureTypeBinder.java | 0 .../topia/binder/referential/SpeciesBinder.java | 0 .../binder/referential/SpeciesFateBinder.java | 0 .../binder/referential/SpeciesGroupBinder.java | 0 .../binder/referential/SpeciesListBinder.java | 0 .../binder/referential/SpeciesStatusBinder.java | 0 .../binder/referential/StomacFullnessBinder.java | 0 .../referential/SurroundingActivityBinder.java | 0 .../TransmittingBuoyOperationBinder.java | 0 .../referential/TransmittingBuoyTypeBinder.java | 0 .../topia/binder/referential/TripTypeBinder.java | 0 .../referential/VesselActivityLonglineBinder.java | 0 .../referential/VesselActivitySeineBinder.java | 0 .../topia/binder/referential/VesselBinder.java | 0 .../referential/VesselSizeCategoryBinder.java | 0 .../topia/binder/referential/VesselTypeBinder.java | 0 .../binder/referential/WeightCategoryBinder.java | 0 .../referential/WeightMeasureTypeBinder.java | 0 .../topia/binder/referential/WindBinder.java | 0 .../topia/binder/BinderEngineMetadataTest.java | 0 .../topia/binder/ReferenceBinderEngineTest.java | 0 services-topia/pom.xml | 6 + .../services/topia/binder/BinderEngineTest.java | 2 + 128 files changed, 763 insertions(+) diff --git a/pom.xml b/pom.xml index 7457318..863fe5b 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,7 @@ <module>entities-migration</module> <module>services-topia-validators</module> <module>services-topia-validation</module> + <module>services-topia-binder</module> <module>services-topia</module> <module>services-rest</module> <module>services-runner</module> diff --git a/services-topia-binder/LICENSE.txt b/services-topia-binder/LICENSE.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/services-topia-binder/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/services-topia-binder/README.md b/services-topia-binder/README.md new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/services-topia-binder/README.md @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/services-topia-binder/pom.xml b/services-topia-binder/pom.xml new file mode 100644 index 0000000..51bb6d8 --- /dev/null +++ b/services-topia-binder/pom.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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.1-SNAPSHOT</version> + </parent> + + <artifactId>services-topia-binder</artifactId> + + <name>ObServe :: Services ToPIA Binder</name> + <description>ObServe services ToPIA Binder</description> + + <dependencies> + + <!-- sibling dependencies --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services-dto</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>entities</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>test</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <!-- commons dependencies --> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + + <!-- Logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + <!-- test dependencies --> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + +</project> \ No newline at end of file diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java similarity index 100% rename from services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java b/services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java similarity index 100% rename from services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java rename to services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java b/services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java similarity index 100% rename from services-topia/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java rename to services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 33b8ca7..cc25da3 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -55,6 +55,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>services-topia-binder</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>test</artifactId> <version>${project.version}</version> <scope>test</scope> diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java index 7d8a1e1..f911892 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java @@ -68,6 +68,7 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.ShipOwnerDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; @@ -227,6 +228,7 @@ public class BinderEngineTest extends AbstractServiceTopiaTest { transformReferentialEntityToDto(ReasonForDiscardDto.class); transformReferentialEntityToDto(ReasonForNoFishingDto.class); transformReferentialEntityToDto(ReasonForNullSetDto.class); + transformReferentialEntityToDto(ShipOwnerDto.class); transformReferentialEntityToDto(SpeciesFateDto.class); transformReferentialEntityToDto(SpeciesStatusDto.class); transformReferentialEntityToDto(SurroundingActivityDto.class); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 337f82ca37cb9e9bcd13368fc09fa724f9c277a8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 09:16:17 2016 +0100 Ajout lengthWeightParameter.source (service) --- .../src/main/xmi/observe-services-dto-common.zargo | Bin 46091 -> 46149 bytes .../referential/LengthWeightParameterBinder.java | 2 ++ 2 files changed, 2 insertions(+) diff --git a/services-dto/src/main/xmi/observe-services-dto-common.zargo b/services-dto/src/main/xmi/observe-services-dto-common.zargo index 6d6c6eb..75fc35e 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-common.zargo and b/services-dto/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java index f5d9752..1966869 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java @@ -53,6 +53,7 @@ public class LengthWeightParameterBinder extends ReferentialBinderSupport<Length entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); entity.setOcean(toEntity(dto.getOcean(), Ocean.class)); entity.setSex(toEntity(dto.getSex(), Sex.class)); + entity.setSource(dto.getSource()); } @@ -65,6 +66,7 @@ public class LengthWeightParameterBinder extends ReferentialBinderSupport<Length dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); dto.setOcean(toReferentialReference(referentialLocale, entity.getOcean(), OceanDto.class)); dto.setSex(toReferentialReference(referentialLocale, entity.getSex(), SexDto.class)); + dto.setSource(entity.getSource()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 472e33992b169596b2ac14e7b01d03a13ec67404 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 09:39:12 2016 +0100 use last stable of eugene --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 863fe5b..4c073d8 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <eugenePluginVersion>3.0-alpha-9</eugenePluginVersion> + <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> <topiaVersion>3.1.3.2</topiaVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 40a236626ac3924f319063a4fc49d3602e10eb66 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 10:57:03 2016 +0100 Ajout NonTargetLength.speciesFate (persistence) --- .../versions/DataSourceMigrationForVersion_5_1.java | 1 + ...evol_8578_nonTargetLength_add_speciesFate-H2.sql | 2 ++ ...evol_8578_nonTargetLength_add_speciesFate-PG.sql | 2 ++ entities/src/main/xmi/observe-seine.zargo | Bin 86054 -> 86621 bytes 4 files changed, 5 insertions(+) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java index 1a6e91a..5f2d873 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java @@ -58,6 +58,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("12", "evol_8475_vessel_add_fields", queries); addScript("13", "evol_7901_add_armateur_table", queries); addScript("14", "evol_8196_lengthWeightParameter_add_source", queries); + addScript("15", "evol_8578_nonTargetLength_add_speciesFate", queries); } private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { diff --git a/entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql new file mode 100644 index 0000000..903c49d --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql @@ -0,0 +1,2 @@ +ALTER TABLE observe_seine.nontargetlength ADD COLUMN speciesFate VARCHAR(255); +ALTER TABLE observe_seine.nontargetlength ADD CONSTRAINT FK_NON_TARGET_LENGTH_SPECIES_FATE FOREIGN KEY(speciesFate) REFERENCES observe_seine.speciesFate(topiaid); diff --git a/entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql new file mode 100644 index 0000000..0135202 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql @@ -0,0 +1,2 @@ +ALTER TABLE observe_seine.nontargetlength ADD COLUMN speciesFate character varying(255); +ALTER TABLE observe_seine.nontargetlength ADD CONSTRAINT FK_NON_TARGET_LENGTH_SPECIES_FATE FOREIGN KEY(speciesFate) REFERENCES observe_seine.speciesFate(topiaid); diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index 7e9b56b..a65346c 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 64f7ce5a9e8edf0896b5148fdeaf2a320a9a4205 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 10:57:52 2016 +0100 Ajout NonTargetLength.speciesFate (ui) --- .../NonTargetLengthDto-ui-update-error-validation.xml | 12 ++++++++++++ .../NonTargetLengthDto-ui-update-warning-validation.xml | 9 +++++++++ .../i18n/application-swing-validation_en_GB.properties | 2 ++ .../i18n/application-swing-validation_es_ES.properties | 2 ++ .../i18n/application-swing-validation_fr_FR.properties | 2 ++ .../application/swing/ui/content/ContentUIHandler.java | 4 ++-- .../ui/content/table/impl/seine/NonTargetCatchUI.jaxx | 2 +- .../ui/content/table/impl/seine/NonTargetSampleUI.jaxx | 12 ++++++++++++ .../ui/content/table/impl/seine/NonTargetSampleUI.jcss | 10 ++++++++++ .../table/impl/seine/NonTargetSampleUIHandler.java | 16 +++++++++++++++- .../content/table/impl/seine/NonTargetSampleUIModel.java | 1 + 11 files changed, 68 insertions(+), 4 deletions(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml index 00ebbc9..4434faa 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-error-validation.xml @@ -43,6 +43,18 @@ </field> + <field name="speciesFate"> + + <!-- speciesFate desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ speciesFate == null || speciesFate.enabled ]]> + </param> + <message>validator.ui.nonTargetLength.desactivated.speciesFate</message> + </field-validator> + + </field> + <field name="length"> <!-- taille obligatoire en mode par count --> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-warning-validation.xml index 23ce5f8..fd26782 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetLengthDto-ui-update-warning-validation.xml @@ -26,6 +26,15 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="speciesFate"> + + <!-- pas de speciesFate selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.ui.nonTargetLength.required.speciesFate</message> + </field-validator> + + </field> + <field name="length"> <!-- validation de la taille par borne --> diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties index e13198a..bd95896 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -357,6 +357,8 @@ validator.ui.nonTargetCatch.required.speciesFate=Species fate must be filled. validator.ui.nonTargetCatch.required.weightOrNombreEstime=Weight or estimated count must be filled. validator.ui.nonTargetCatch.required.weightOrTailleMoyen=Weight or mean size must be filled. validator.ui.nonTargetCatch.uniqueKey=Tuple (speces - objectFate) muste be unique. +validator.ui.nonTargetLength.desactivated.speciesFate=Selected species fate is disabled. +validator.ui.nonTargetLength.required.speciesFate=Species fate must be filled. validator.ui.nonTargetSample.bound.length=Length must be bound between %s and %s. validator.ui.nonTargetSample.bound.weight=Weight must be bound between %s and %s. validator.ui.nonTargetSample.comment.tobig=Comment size can not exceed 1024 characters. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties index a136d1b..0c96771 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -357,6 +357,8 @@ validator.ui.nonTargetCatch.required.speciesFate=Es obligatoiro seleccionar un f validator.ui.nonTargetCatch.required.weightOrNombreEstime=Debe seleccionar uno de los dos valores (peso estimado, número estimado). validator.ui.nonTargetCatch.required.weightOrTailleMoyen=Debe seleccionar uno de los dos valores (peso medio o talla media). validator.ui.nonTargetCatch.uniqueKey=El par (especie - objectFate) debe ser único. +validator.ui.nonTargetLength.desactivated.speciesFate=El objectFate de fauna seleccionado está desactivado. +validator.ui.nonTargetLength.required.speciesFate=Es obligatoiro seleccionar un futuro de fauna. validator.ui.nonTargetSample.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. validator.ui.nonTargetSample.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. validator.ui.nonTargetSample.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties index a34f2d1..4dbebdf 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -357,6 +357,8 @@ validator.ui.nonTargetCatch.required.speciesFate=La sélection d'un devenir faun validator.ui.nonTargetCatch.required.weightOrNombreEstime=Une des deux valeurs (poids estimé, nombre estimé) doit être renseignée. validator.ui.nonTargetCatch.required.weightOrTailleMoyen=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. validator.ui.nonTargetCatch.uniqueKey=Le couple (espèce - objectFate) doit être unique. +validator.ui.nonTargetLength.desactivated.speciesFate=Le devenir faune sélectionné est désactivé. +validator.ui.nonTargetLength.required.speciesFate=La sélection d'un devenir faune est obligatoire. validator.ui.nonTargetSample.bound.length=La taille pour cette espèce doit être comprise entre %1$s et %2$s. validator.ui.nonTargetSample.bound.weight=Le poids pour cette espèce doit être compris entre %1$s et %2$s. validator.ui.nonTargetSample.comment.tobig=La taille du commentaire est limitée à 1024 caractères. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 624f997..fac0e17 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -37,9 +37,9 @@ import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferen import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.shared.AbstractUIAction; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; -import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; +import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.renderer.AbstractObserveTreeCellRenderer; import fr.ird.observe.application.swing.ui.util.SpringUtilities; import fr.ird.observe.application.swing.validation.ValidationContext; import fr.ird.observe.services.dto.AbstractObserveDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx index 4dc0585..f8ed3bd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx @@ -94,7 +94,7 @@ </cell> </row> - <!-- objectFate faune --> + <!-- speciesFate --> <row> <cell> <JLabel id='speciesFateLabel'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index ac03944..6bbce3e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -34,6 +34,7 @@ fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.referential.seine.SpeciesFateDto fr.ird.observe.services.dto.seine.NonTargetLengthDto fr.ird.observe.services.dto.seine.NonTargetSampleDto fr.ird.observe.application.swing.ui.content.table.impl.seine.ModeSaisieEchantillonEnum @@ -188,6 +189,17 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species </cell> </row> + <!-- speciesFate --> + <row> + <cell> + <JLabel id='speciesFateLabel'/> + </cell> + <cell weightx='1' anchor='east' columns="2"> + <BeanComboBox id='speciesFate' constructorParams='this' genericType='ReferentialReference<SpeciesFateDto>' _entityClass='SpeciesFateDto.class'/> + </cell> + </row> + + <!-- reference pĥoto --> <row> <cell> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss index 6a54aaf..74897b1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss @@ -24,6 +24,16 @@ text:"observe.common.speciesFaune"; } +#speciesFateLabel { + text:"observe.common.speciesFate"; + labelFor:{speciesFate}; +} + +#speciesFate { + property:{NonTargetLengthDto.PROPERTY_SPECIES_FATE}; + selectedItem:{tableEditBean.getSpeciesFate()}; +} + #acquisitionModeGroup { selectedValue:{ModeSaisieEchantillonEnum.valueOf(tableEditBean.getAcquisitionMode())}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index 5aa7646..f8358bf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; @@ -273,8 +274,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS @Override protected void loadEditBean(String beanId) { Form<NonTargetSampleDto> form = getNonTargetSampleService().loadForm(beanId); - loadReferentialReferenceSetsInModel(form); getModel().setForm(form); + loadReferentialReferenceSetsInModel(form); NonTargetSampleHelper.copyNonTargetSampleDto(form.getObject(), getBean()); } @@ -296,6 +297,19 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS break; + case NonTargetLengthDto.PROPERTY_SPECIES_FATE: { + + // on conserve uniquement les devenir utilisés dans les captures + Collection<ReferentialReference<SpeciesFateDto>> speciesFate = getModel().getForm().getObject().getSpeciesFate(); + result = (Collection) speciesFate; + + if (log.isDebugEnabled()) { + log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); + } + } + + break; + } return result; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java index 495344b..78c0ca5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java @@ -59,6 +59,7 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD NonTargetLengthDto.PROPERTY_IS_WEIGHT_COMPUTED, NonTargetLengthDto.PROPERTY_SEX, NonTargetLengthDto.PROPERTY_COUNT, + NonTargetLengthDto.PROPERTY_SPECIES_FATE, NonTargetLengthDto.PROPERTY_ACQUISITION_MODE, NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES }); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.