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 ce4972e22a981b910d906482498805c4f0019ff0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 31 13:31:21 2016 +0200 explode validation module to validators + add generators --- application-swing-validation/pom.xml | 77 ++- .../application-swing-validation_en_GB.properties | 180 ++++++ .../application-swing-validation_fr_FR.properties | 180 ++++++ .../src/test/resources/validators.xml | 20 +- application-swing-validators/LICENSE.txt | 674 +++++++++++++++++++++ application-swing-validators/README.md | 0 .../pom.xml | 38 +- .../AbstractSpeciesFieldDtoValidator.java | 2 +- .../ActivityFinDeVeilleExistsDtoValidator.java | 2 +- .../ActivitySimpleSpeedDtoValidator.java | 2 +- .../validators/ActivitySpeedDtoValidator.java | 2 +- .../CollectionUniqueKeyDtoValidator.java | 2 +- .../ObserveCollectionUniqueKeyDtoValidator.java | 2 +- .../validators/OpenableDtoFieldValidator.java | 2 +- .../SetLonglineUniqueHomeIdDtoValidator.java | 2 +- .../SetLonglineUniqueNumberDtoValidator.java | 2 +- .../validators/SpeciesLengthFieldDtoValidator.java | 2 +- .../validators/SpeciesWeightFieldDtoValidator.java | 2 +- services-topia-validation/pom.xml | 81 ++- .../services-topia-validation_en_GB.properties | 173 ++++++ .../services-topia-validation_fr_FR.properties | 173 ++++++ .../src/test/resources/validators.xml | 18 +- services-topia-validators/LICENSE.txt | 674 +++++++++++++++++++++ services-topia-validators/README.md | 0 .../pom.xml | 89 +-- .../validators/AbstractSpeciesFieldValidator.java | 2 +- .../ActivityFinDeVeilleExistsValidator.java | 2 +- .../validators/ActivitySimpleSpeedValidator.java | 2 +- .../topia}/validators/ActivitySpeedValidator.java | 2 +- .../validators/CollectionUniqueKeyValidator2.java | 2 +- .../ObserveCollectionUniqueKeyValidator.java | 2 +- .../SetLonglineUniqueHomeIdValidator.java | 2 +- .../SetLonglineUniqueNumberValidator.java | 2 +- .../validators/SpeciesLengthFieldValidator.java | 2 +- .../validators/SpeciesWeightFieldValidator.java | 2 +- 35 files changed, 2221 insertions(+), 198 deletions(-) diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 126eb4d..5afcd21 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -20,7 +20,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<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> @@ -48,36 +49,19 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>application-swing-decoration</artifactId> + <artifactId>application-swing-validators</artifactId> <version>${project.version}</version> - </dependency> - - - <!-- commons dependencies --> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <scope>runtime</scope> </dependency> <!-- Nuiton --> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> - - <!-- XWork --> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> + <artifactId>nuiton-validator</artifactId> </dependency> <!-- Logging --> @@ -122,6 +106,49 @@ <plugins> <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>maven-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <contexts> + <context>ui-create</context> + <context>ui-update</context> + </contexts> + <validatorsFile>${project.basedir}/src/test/resources/validators.xml</validatorsFile> + </configuration> + <executions> + <execution> + <id>generate-i18n-validator-fields</id> + <goals> + <goal>generate-i18n-validator-fields</goal> + </goals> + <configuration> + <prefix>observe.common.</prefix> + </configuration> + </execution> + <execution> + <id>generate-validators-descriptor</id> + <phase>generate-sources</phase> + <goals> + <goal>generate-validators-descriptor</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services-model</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>application-swing-validators</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> @@ -141,6 +168,10 @@ <param>**/**-validation.xml</param> </includes> </entry> + <entry> + <specificGoal>parserJava</specificGoal> + <basedir>${project.build.directory}/generated-sources/java</basedir> + </entry> </entries> </configuration> </execution> 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 7d376b1..abb0bf9 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 @@ -1,3 +1,183 @@ +observe.common.activityLongline=Activity +observe.common.activitySeine=Activity +observe.common.baitHaulingStatus=Bait hauling status +observe.common.baitSettingStatus=Bait setting status +observe.common.baitType=Bait type +observe.common.basket=Basket +observe.common.basketsPerSectionCount=Basket per section count +observe.common.branchline=Branchline +observe.common.branchlinesPerBasketCount=Branchlines per basket count +observe.common.brandName=Brand name +observe.common.capacity=Capacity +observe.common.capacityLabel=Capacity label +observe.common.captain=Captain +observe.common.catchFateLongline=Catch fate +observe.common.catchHealthness=Catch healthness +observe.common.catchWeight=Catch weight +observe.common.changeDate=Change date +observe.common.code=Code +observe.common.coefficients=Coefficients +observe.common.comment=Comment +observe.common.count=Count +observe.common.country=Country +observe.common.currentDirection=Current direction +observe.common.currentFpaZone=Current Fpa zone +observe.common.currentSpeed=Current speed +observe.common.dataEntryOperator=Data entry operator +observe.common.date=Date +observe.common.daysAtSeaCount=Days at sea count +observe.common.departureHarbour=Departure harbour +observe.common.deployementEnd=Deployement end +observe.common.description=Description +observe.common.detectionMode=Detection mode +observe.common.discardHealthness=Discard healthness +observe.common.distance=Distance +observe.common.encounterType=Encounter type +observe.common.endDate=End date +observe.common.endLogValue=End log value +observe.common.endPursingDate=End pursing date +observe.common.endPursingTimeStamp=End pursing timestamp +observe.common.endSetDate=End set date +observe.common.endSetTimeStamp=End set timestamp +observe.common.faoCode=Fao code +observe.common.firstName=First name +observe.common.fishingEnd=Fishing end +observe.common.fishingStart=Fishing start +observe.common.flagCountry=Flag country +observe.common.fleetCountry=Fleet country +observe.common.floatingObjectEmpty=Floating object empty +observe.common.formsUrl=Forms url +observe.common.fpaZone=Fpa zone +observe.common.gaugeLabel=Gauge label +observe.common.gear=Gear +observe.common.gearCaracteristicType=Gear caracteristic type +observe.common.gearType=Gear type +observe.common.gearUseFeaturesLongline=Gear use features +observe.common.gearUseFeaturesSeine=Gear use features +observe.common.gonadeWeight=Gonade weight +observe.common.haulingBreaks=Hauling breaks +observe.common.haulingDirectionSameAsSetting=Hauling direction same as setting +observe.common.haulingEndLatitude=Hauling end latitude +observe.common.haulingEndLongitude=Hauling end longitude +observe.common.haulingEndTimeStamp=Hauling end timeStamp +observe.common.haulingStartLatitude=Hauling start latitude +observe.common.haulingStartLongitude=Hauling start longitude +observe.common.haulingStartTimeStamp=Hauling start timeStamp +observe.common.homeId=Home id +observe.common.hookOffset=Hook offset +observe.common.hookPosition=Hook position +observe.common.hookSize=Hook size +observe.common.hookType=Hook type +observe.common.individualSize=Individual size +observe.common.individualWeight=Individual weight +observe.common.iso2Code=Iso 2 code +observe.common.iso3Code=Iso 3 code +observe.common.itemHorizontalPosition=Item horizontal position +observe.common.itemVerticalPosition=Item vertical position +observe.common.keelCode=Keel code +observe.common.label1=English label +observe.common.label2=French label +observe.common.label3=Spanish label +observe.common.landingHarbour=Landing harbour +observe.common.lastName=Last name +observe.common.latitude=Latitude +observe.common.length=Length +observe.common.lengthWeightFormula=Length weight formula +observe.common.lightsticksColor=Lightsticks color +observe.common.lightsticksPerBasketCount=Lightsticks per basket count +observe.common.lightsticksType=Lightsticks type +observe.common.lineType=Line type +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturity status +observe.common.maxDepthTargeted=Max depth targeted +observe.common.maxGearDepth=Max gear depth +observe.common.meanLength=Mean length +observe.common.meanWeight=Mean weight +observe.common.name=Name +observe.common.nextFpaZone=Next Fpa zone +observe.common.nonTargetCatch=Non target catch +observe.common.number=Number +observe.common.objectFate=Object fate +observe.common.objectOperation=Object operation +observe.common.objectType=Object type +observe.common.observedSystem=Observed system +observe.common.observedSystemDistance=Observed system distance +observe.common.observedSystemEmpty=Observed system empty +observe.common.observer=Observed +observe.common.ocean=Ocean +observe.common.organism=Organism +observe.common.power=Power +observe.common.previousFpaZone=Previous fpa zone +observe.common.proportion=Proportion +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Reason for discad +observe.common.reasonForNoFishing=Reason for no fishing +observe.common.reasonForNullSet=Reason for null set +observe.common.reportsUrl=Reports url +observe.common.route=Route +observe.common.schoolEstimate=School estimate +observe.common.schoolMeanDepth=School mean depth +observe.common.schoolThickness=School thickness +observe.common.schoolTopDepth=School top depth +observe.common.scientificLabel=Scientific label +observe.common.seaSurfaceTemperature=Sea surface temperature +observe.common.searchMaximum=Search maximum +observe.common.section=Section +observe.common.sensorBrand=Sensor brand +observe.common.sensorDataFormat=Sensor data format +observe.common.sensorSerialNo=Sensor serial no +observe.common.sensorType=Sensor type +observe.common.settingEndLatitude=Setting end latitude +observe.common.settingEndLongitude=Setting end longitude +observe.common.settingEndTimeStamp=Setting end timeStamp +observe.common.settingShape=Setting shape +observe.common.settingStartLatitude=Setting start latitude +observe.common.settingStartLongitude=Setting start longitude +observe.common.settingStartTimeStamp=Setting start timeStamp +observe.common.settingVesselSpeed=Setting vessel speed +observe.common.sex=Sex +observe.common.shooterSpeed=Shooter speed +observe.common.snapWeight=Snap weight +observe.common.species=Species +observe.common.speciesCatch=Species +observe.common.speciesFate=Species fate +observe.common.speciesGroup=Species group +observe.common.speciesStatus=Species status +observe.common.speedRange=Speed range +observe.common.startDate=Start date +observe.common.startLogValue=Start log value +observe.common.startTime=Sart time +observe.common.status=Status +observe.common.stomacFullness=Stomac fullness +observe.common.supportVesselName=Support vessel name +observe.common.surroundingActivity=Surrounding activity +observe.common.swivelWeight=Swivel weight +observe.common.time=Time +observe.common.timeBetweenHooks=Time between hooks +observe.common.topType=Top type +observe.common.totalBasketsCount=Total baskets count +observe.common.totalCount=Count +observe.common.totalHooksCount=Total hooks count +observe.common.totalSectionsCount=Total section count +observe.common.totalWeight=Total weight +observe.common.tracelineType=Traceline type +observe.common.transmittingBuoyOperation=Transmitting buoy operation +observe.common.transmittingBuoyType=Transmitting buoy type +observe.common.tripType=Trip type +observe.common.uri=Uri +observe.common.vessel=Boat +observe.common.vesselActivityLongline=Vessel activity +observe.common.vesselActivitySeine=Vessel activity +observe.common.vesselSizeCategory=Vessel size category +observe.common.vesselSpeed=Vessel spped +observe.common.vesselType=Vessel type +observe.common.waveHeight=Wave weight +observe.common.weight=Weight +observe.common.weightLengthFormula=Weight length formula +observe.common.wind=Wind +observe.common.wormsId=Worms id +observe.common.yearService=Year service validator.ui.activity.bound.latitude=Latitude must be between %1$s and %2$s. validator.ui.activity.bound.longitude=Longitude must be between %1$s and %2$s. validator.ui.activity.bound.seaSurfaceTemperature=Temperature must be between %1$s and %2$s. 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 184516c..351fa5a 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 @@ -1,3 +1,183 @@ +observe.common.activityLongline=Activité +observe.common.activitySeine=Activité +observe.common.baitHaulingStatus=Statut appât au virage +observe.common.baitSettingStatus=Statut appât au filage +observe.common.baitType=Type d'appât +observe.common.basket=Panier +observe.common.basketsPerSectionCount=Nombre de panier par section +observe.common.branchline=Avançon +observe.common.branchlinesPerBasketCount=Nombre d'hameçons par panier +observe.common.brandName=Marque +observe.common.capacity=Capacité transport (m³) +observe.common.capacityLabel=Libellé capacité +observe.common.captain=Capitaine +observe.common.catchFateLongline=Devenir +observe.common.catchHealthness=Santé à la capture +observe.common.catchWeight=Poids estimé (en t) +observe.common.changeDate=Date changement pavillon +observe.common.code=Identifiant +observe.common.coefficients=Coefficients +observe.common.comment=Seules les espèces montées sur le pont pourront être échantillonnées +observe.common.count=Nombre +observe.common.country=Nationalité +observe.common.currentDirection=Direction du courant (°) +observe.common.currentFpaZone=zone Fpa courante +observe.common.currentSpeed=Vitesse du courant (nd) +observe.common.dataEntryOperator=Opérateur de saisie +observe.common.date=Jour d'observation +observe.common.daysAtSeaCount=Nombre de jours à l'eau +observe.common.departureHarbour=Port de départ +observe.common.deployementEnd=Fin déploiement +observe.common.description=Description +observe.common.detectionMode=Mode détection +observe.common.discardHealthness=Santé au rejet +observe.common.distance=Distance (m) +observe.common.encounterType=Type +observe.common.endDate=Date fin +observe.common.endLogValue=Loch du soir (milles) +observe.common.endPursingDate=Date de fin coulissage +observe.common.endPursingTimeStamp=Date - Heure de fin coulissage +observe.common.endSetDate=Date fin calée +observe.common.endSetTimeStamp=Date - Heure de fin de validité +observe.common.faoCode=Code FAO +observe.common.firstName=Prénom +observe.common.fishingEnd=Fin pêche +observe.common.fishingStart=Début pêche +observe.common.flagCountry=Pavillon +observe.common.fleetCountry=Flotte +observe.common.floatingObjectEmpty=Objet flottant vide +observe.common.formsUrl=URL des formulaires +observe.common.fpaZone=Zone FPA +observe.common.gaugeLabel=Libellé jauge +observe.common.gear=Equipement +observe.common.gearCaracteristicType=Type de caractéristique +observe.common.gearType=Type d'équipement +observe.common.gearUseFeaturesLongline=Équipements +observe.common.gearUseFeaturesSeine=Équipements +observe.common.gonadeWeight=Poids des gonades (g) +observe.common.haulingBreaks=Nombre de coupures +observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage +observe.common.haulingEndLatitude=Latitude de fin virage +observe.common.haulingEndLongitude=Longitude de fin virage +observe.common.haulingEndTimeStamp=Horodatage fin +observe.common.haulingStartLatitude=Latitude de début de virage +observe.common.haulingStartLongitude=Longitude de début de virage +observe.common.haulingStartTimeStamp=Horodatage début +observe.common.homeId=Id métier +observe.common.hookOffset=Offset hameçon (°) +observe.common.hookPosition=Position de l'hameçon +observe.common.hookSize=Taille d'hameçon +observe.common.hookType=Type d'hameçon +observe.common.individualSize=Taille (cm) +observe.common.individualWeight=Poids (kg) +observe.common.iso2Code=code ISO-2 +observe.common.iso3Code=Code ISO-3 +observe.common.itemHorizontalPosition=Position sur la ligne +observe.common.itemVerticalPosition=Position verticale +observe.common.keelCode=Code quille +observe.common.label1=Libellé anglais +observe.common.label2=Libellé français +observe.common.label3=Libellé espagnol +observe.common.landingHarbour=Port d'arrivée +observe.common.lastName=Nom +observe.common.latitude=Latitude +observe.common.length=Longueur (m) +observe.common.lengthWeightFormula=Relation Poids +observe.common.lightsticksColor=Couleur de cyalumes +observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier +observe.common.lightsticksType=Type de cyalumes +observe.common.lineType=Type de ligne +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturité sexuelle +observe.common.maxDepthTargeted=Profondeur maximum ciblée +observe.common.maxGearDepth=Profondeur maximum (m) +observe.common.meanLength=Taille moyenne (en cm) +observe.common.meanWeight=Poids moyen (en Kg) +observe.common.name=Nom +observe.common.nextFpaZone=zone Fpa suivante +observe.common.nonTargetCatch=Capture non ciblé +observe.common.number=Numéro +observe.common.objectFate=Devenir de l'objet +observe.common.objectOperation=Opération sur l'objet +observe.common.objectType=Type d'objet +observe.common.observedSystem=Système observé +observe.common.observedSystemDistance=Distance système observé (en milles avec 1 décimale) +observe.common.observedSystemEmpty=Système observé vide +observe.common.observer=Observateur +observe.common.ocean=Océan +observe.common.organism=Organisme +observe.common.power=Puissance moteur principal +observe.common.previousFpaZone=Zone Fpa précédente +observe.common.proportion=Proportion (%) +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Raison rejet +observe.common.reasonForNoFishing=Raison de non coup de Senne +observe.common.reasonForNullSet=Cause coup nul +observe.common.reportsUrl=URL de rapport +observe.common.route=Route +observe.common.schoolEstimate=Estimation de banc +observe.common.schoolMeanDepth=Profondeur moyenne (m) +observe.common.schoolThickness=Épaisseur du banc (m) +observe.common.schoolTopDepth=Profondeur sommet (m) +observe.common.scientificLabel=Libellé scientifique +observe.common.seaSurfaceTemperature=Température surface (°) +observe.common.searchMaximum=Vitesse maximale +observe.common.section=Section +observe.common.sensorBrand=Marque +observe.common.sensorDataFormat=Format de données +observe.common.sensorSerialNo=Numéro de série +observe.common.sensorType=Type +observe.common.settingEndLatitude=Latitude de fin de filage +observe.common.settingEndLongitude=Longitude de fin de filage +observe.common.settingEndTimeStamp=Horodatage fin +observe.common.settingShape=Forme du filage +observe.common.settingStartLatitude=Latitude de début de filage +observe.common.settingStartLongitude=\=Longitude de début de filage +observe.common.settingStartTimeStamp=Horodatage début +observe.common.settingVesselSpeed=Vitesse bateau (nd) +observe.common.sex=Sexe +observe.common.shooterSpeed=Vitesse shooter (nd) +observe.common.snapWeight=Poids snap (kg) +observe.common.species=Espèces +observe.common.speciesCatch=Espèce +observe.common.speciesFate=Devenir espèce +observe.common.speciesGroup=Groupe espèce +observe.common.speciesStatus=Statut faune observée +observe.common.speedRange=Libellé vitesse vent +observe.common.startDate=Date début +observe.common.startLogValue=Loch du matin (milles) +observe.common.startTime=Date - Heure de début de validité +observe.common.status=Statut +observe.common.stomacFullness=État de l'estomac +observe.common.supportVesselName=Nom supply +observe.common.surroundingActivity=Activité environnante +observe.common.swivelWeight=Poids de l'émerillon (kg) +observe.common.time=Heure +observe.common.timeBetweenHooks=Temps entre hameçons (s) +observe.common.topType=Type +observe.common.totalBasketsCount=Nombre de paniers +observe.common.totalCount=Nombre estimé +observe.common.totalHooksCount=Nombre total d'avançons +observe.common.totalSectionsCount=Nombre total de sections +observe.common.totalWeight=Poids total +observe.common.tracelineType=Type bas de ligne +observe.common.transmittingBuoyOperation=Opération balise +observe.common.transmittingBuoyType=Type de balise +observe.common.tripType=Type de marée +observe.common.uri=URI +observe.common.vessel=Navire +observe.common.vesselActivityLongline=Activité bateau +observe.common.vesselActivitySeine=Activité bateau +observe.common.vesselSizeCategory=Catégorie de bateau +observe.common.vesselSpeed=Vitesse bateau (nd) +observe.common.vesselType=Type de pêcherie +observe.common.waveHeight=Libellé Hauteur moyenne vagues +observe.common.weight=Poids (en t) +observe.common.weightLengthFormula=Relation Taille +observe.common.wind=Vent Beaufort +observe.common.wormsId=Worms +observe.common.yearService=Année de mise en service validator.ui.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. validator.ui.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. validator.ui.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s et %2$s. diff --git a/application-swing-validation/src/test/resources/validators.xml b/application-swing-validation/src/test/resources/validators.xml index dde5efe..b49e747 100644 --- a/application-swing-validation/src/test/resources/validators.xml +++ b/application-swing-validation/src/test/resources/validators.xml @@ -52,15 +52,15 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- Les validateurs spécifique aux Dto dans observe --> - <validator name="collectionUniqueKeyDto" class="fr.ird.observe.application.swing.validation.validators.CollectionUniqueKeyDtoValidator"/> - <validator name="observeCollectionUniqueKeyDto" class="fr.ird.observe.application.swing.validation.validators.ObserveCollectionUniqueKeyDtoValidator"/> - <validator name="openableDto" class="fr.ird.observe.application.swing.validation.validators.OpenableDtoFieldValidator"/> - <validator name="species_lengthDto" class="fr.ird.observe.application.swing.validation.validators.SpeciesLengthFieldDtoValidator"/> - <validator name="species_weightDto" class="fr.ird.observe.application.swing.validation.validators.SpeciesWeightFieldDtoValidator"/> - <validator name="activitySpeedDto" class="fr.ird.observe.application.swing.validation.validators.ActivitySpeedDtoValidator"/> - <validator name="activitySimpleSpeedDto" class="fr.ird.observe.application.swing.validation.validators.ActivitySimpleSpeedDtoValidator"/> - <validator name="activityFinDeVeilleExistsDto" class="fr.ird.observe.application.swing.validation.validators.ActivityFinDeVeilleExistsDtoValidator"/> - <validator name="setLonglineUniqueHomeIdDto" class="fr.ird.observe.application.swing.validation.validators.SetLonglineUniqueHomeIdDtoValidator"/> - <validator name="setLonglineUniqueNumberDto" class="fr.ird.observe.application.swing.validation.validators.SetLonglineUniqueNumberDtoValidator"/> + <validator name="collectionUniqueKeyDto" class="fr.ird.observe.application.swing.validators.CollectionUniqueKeyDtoValidator"/> + <validator name="observeCollectionUniqueKeyDto" class="fr.ird.observe.application.swing.validators.ObserveCollectionUniqueKeyDtoValidator"/> + <validator name="openableDto" class="fr.ird.observe.application.swing.validators.OpenableDtoFieldValidator"/> + <validator name="species_lengthDto" class="fr.ird.observe.application.swing.validators.SpeciesLengthFieldDtoValidator"/> + <validator name="species_weightDto" class="fr.ird.observe.application.swing.validators.SpeciesWeightFieldDtoValidator"/> + <validator name="activitySpeedDto" class="fr.ird.observe.application.swing.validators.ActivitySpeedDtoValidator"/> + <validator name="activitySimpleSpeedDto" class="fr.ird.observe.application.swing.validators.ActivitySimpleSpeedDtoValidator"/> + <validator name="activityFinDeVeilleExistsDto" class="fr.ird.observe.application.swing.validators.ActivityFinDeVeilleExistsDtoValidator"/> + <validator name="setLonglineUniqueHomeIdDto" class="fr.ird.observe.application.swing.validators.SetLonglineUniqueHomeIdDtoValidator"/> + <validator name="setLonglineUniqueNumberDto" class="fr.ird.observe.application.swing.validators.SetLonglineUniqueNumberDtoValidator"/> </validators> diff --git a/application-swing-validators/LICENSE.txt b/application-swing-validators/LICENSE.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/application-swing-validators/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/application-swing-validators/README.md b/application-swing-validators/README.md new file mode 100644 index 0000000..e69de29 diff --git a/application-swing-validation/pom.xml b/application-swing-validators/pom.xml similarity index 72% copy from application-swing-validation/pom.xml copy to application-swing-validators/pom.xml index 126eb4d..fbed864 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validators/pom.xml @@ -20,7 +20,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<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> @@ -29,10 +30,10 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>application-swing-validation</artifactId> + <artifactId>application-swing-validators</artifactId> - <name>ObServe :: Application Swing Validation</name> - <description>ObServe Application Swing Validation</description> + <name>ObServe :: Application Swing Validators</name> + <description>ObServe Application Swing Validators</description> <properties> @@ -119,35 +120,6 @@ </resource> </resources> - <plugins> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <id>scan-sources</id> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> - </goals> - <configuration> - <entries> - <entry> - <specificGoal>parserValidation</specificGoal> - <basedir>${project.basedir}/src/main/resources/</basedir> - <includes> - <param>**/**-validation.xml</param> - </includes> - </entry> - </entries> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> </build> </project> diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/AbstractSpeciesFieldDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java similarity index 99% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/AbstractSpeciesFieldDtoValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java index 5150a62..e2088c5 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/AbstractSpeciesFieldDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivityFinDeVeilleExistsDtoValidator.java similarity index 98% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivityFinDeVeilleExistsDtoValidator.java index 28ee80c..5f74e36 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivityFinDeVeilleExistsDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySimpleSpeedDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java similarity index 99% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySimpleSpeedDtoValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java index 9940805..6d7a913 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySimpleSpeedDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java similarity index 99% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java index 7297d82..05b4537 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CollectionUniqueKeyDtoValidator.java similarity index 95% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CollectionUniqueKeyDtoValidator.java index 663daf4..c5e1a6d 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CollectionUniqueKeyDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ObserveCollectionUniqueKeyDtoValidator.java similarity index 99% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ObserveCollectionUniqueKeyDtoValidator.java index 79821b8..bc37627 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ObserveCollectionUniqueKeyDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/OpenableDtoFieldValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/OpenableDtoFieldValidator.java similarity index 98% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/OpenableDtoFieldValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/OpenableDtoFieldValidator.java index 9a558ef..18c1cec 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/OpenableDtoFieldValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/OpenableDtoFieldValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java similarity index 97% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java index 848a002..5ac0abb 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueHomeIdDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java similarity index 97% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java index 117ac4e..61a978b 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SetLonglineUniqueNumberDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesLengthFieldDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesLengthFieldDtoValidator.java similarity index 95% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesLengthFieldDtoValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesLengthFieldDtoValidator.java index f71e9a5..c46d9a2 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesLengthFieldDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesLengthFieldDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesWeightFieldDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesWeightFieldDtoValidator.java similarity index 95% rename from application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesWeightFieldDtoValidator.java rename to application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesWeightFieldDtoValidator.java index e7516c6..f2c990c 100644 --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/SpeciesWeightFieldDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesWeightFieldDtoValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.validation.validators; +package fr.ird.observe.application.swing.validators; /* * #%L diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index d081ee1..f51eda8 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -48,47 +48,37 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>services-api</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> - - <!-- Nuiton --> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>services-topia-validators</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> </dependency> <!-- commons --> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <!-- ToPIA --> + <!-- Nuiton --> <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> + <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> </dependency> <!-- test --> @@ -129,6 +119,50 @@ </resources> <plugins> + + <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>maven-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <contexts> + <context>service</context> + </contexts> + <validatorsFile>${project.basedir}/src/test/resources/validators.xml</validatorsFile> + </configuration> + <executions> + <execution> + <id>generate-i18n-validator-fields</id> + <phase>generate-sources</phase> + <goals> + <goal>generate-i18n-validator-fields</goal> + </goals> + <configuration> + <prefix>observe.common.</prefix> + </configuration> + </execution> + <execution> + <id>generate-validators-descriptor</id> + <phase>generate-sources</phase> + <goals> + <goal>generate-validators-descriptor</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>entities</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services-topia-validators</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> @@ -136,6 +170,7 @@ <execution> <goals> <goal>parserValidation</goal> + <goal>parserJava</goal> <goal>gen</goal> </goals> <configuration> @@ -147,6 +182,10 @@ <param>**/**-validation.xml</param> </includes> </entry> + <entry> + <specificGoal>parserJava</specificGoal> + <basedir>${project.build.directory}/generated-sources/java</basedir> + </entry> </entries> </configuration> </execution> diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties index 66ed734..d728ddf 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties @@ -1,3 +1,176 @@ +observe.common.activitySeine=Activity +observe.common.baitHaulingStatus=Bait hauling status +observe.common.baitSettingStatus=Bait setting status +observe.common.baitType=Bait type +observe.common.basket=Basket +observe.common.basketsPerSectionCount=Basket per section count +observe.common.branchline=Branchline +observe.common.branchlinesPerBasketCount=Branchlines per basket count +observe.common.brandName=Brand name +observe.common.capacity=Capacity +observe.common.capacityLabel=Capacity label +observe.common.captain=Captain +observe.common.catchFateLongline=Catch fate +observe.common.catchHealthness=Catch healthness +observe.common.catchWeight=Catch weight +observe.common.changeDate=Change date +observe.common.code=Code +observe.common.coefficients=Coefficients +observe.common.comment=Comment +observe.common.count=Count +observe.common.country=Country +observe.common.currentDirection=Current direction +observe.common.currentSpeed=Current speed +observe.common.dataEntryOperator=Data entry operator +observe.common.date=Date +observe.common.daysAtSeaCount=Days at sea count +observe.common.departureHarbour=Departure harbour +observe.common.deployementEnd=Deployement end +observe.common.description=Description +observe.common.detectionMode=Detection mode +observe.common.discardHealthness=Discard healthness +observe.common.distance=Distance +observe.common.encounterType=Encounter type +observe.common.endDate=End date +observe.common.endLogValue=End log value +observe.common.endPursingDate=End pursing date +observe.common.endPursingTimeStamp=End pursing timestamp +observe.common.endSetDate=End set date +observe.common.endSetTimeStamp=End set timestamp +observe.common.faoCode=Fao code +observe.common.firstName=First name +observe.common.fishingEnd=Fishing end +observe.common.fishingStart=Fishing start +observe.common.flagCountry=Flag country +observe.common.fleetCountry=Fleet country +observe.common.floatingObject=Floating object +observe.common.formsUrl=Forms url +observe.common.fpaZone=Fpa zone +observe.common.gaugeLabel=Gauge label +observe.common.gear=Gear +observe.common.gearCaracteristicType=Gear caracteristic type +observe.common.gonadeWeight=Gonade weight +observe.common.haulingBreaks=Hauling breaks +observe.common.haulingDirectionSameAsSetting=Hauling direction same as setting +observe.common.haulingEndLatitude=Hauling end latitude +observe.common.haulingEndLongitude=Hauling end longitude +observe.common.haulingEndQuadrant=Hauling end quadrant +observe.common.haulingEndTimeStamp=Hauling end timeStamp +observe.common.haulingStartLatitude=Hauling start latitude +observe.common.haulingStartLongitude=Hauling start longitude +observe.common.haulingStartQuadrant=Hauling start quadrant +observe.common.haulingStartTimeStamp=Hauling start timeStamp +observe.common.homeId=Home id +observe.common.hookOffset=Hook offset +observe.common.hookPosition=Hook position +observe.common.hookSize=Hook size +observe.common.hookType=Hook type +observe.common.individualSize=Individual size +observe.common.individualWeight=Individual weight +observe.common.iso2Code=Iso 2 code +observe.common.iso3Code=Iso 3 code +observe.common.itemHorizontalPosition=Item horizontal position +observe.common.itemVerticalPosition=Item vertical position +observe.common.keelCode=Keel code +observe.common.label1=English label +observe.common.label2=French label +observe.common.label3=Spanish label +observe.common.landingHarbour=Landing harbour +observe.common.lastName=Last name +observe.common.latitude=Latitude +observe.common.length=Length +observe.common.lengthWeightFormula=Length weight formula +observe.common.lightsticksColor=Lightsticks color +observe.common.lightsticksPerBasketCount=Lightsticks per basket count +observe.common.lightsticksType=Lightsticks type +observe.common.lineType=Line type +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturity status +observe.common.maxDepthTargeted=Max depth targeted +observe.common.maxGearDepth=Max gear depth +observe.common.meanLength=Mean length +observe.common.meanWeight=Mean weight +observe.common.name=Name +observe.common.number=Number +observe.common.objectFate=Object fate +observe.common.objectOperation=Object operation +observe.common.objectType=Object type +observe.common.observedSystem=Observed system +observe.common.observedSystemDistance=Observed system distance +observe.common.observer=Observed +observe.common.ocean=Ocean +observe.common.organism=Organism +observe.common.power=Power +observe.common.proportion=Proportion +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Reason for discad +observe.common.reasonForNoFishing=Reason for no fishing +observe.common.reasonForNullSet=Reason for null set +observe.common.reportsUrl=Reports url +observe.common.route=Route +observe.common.schoolMeanDepth=School mean depth +observe.common.schoolThickness=School thickness +observe.common.schoolTopDepth=School top depth +observe.common.scientificLabel=Scientific label +observe.common.seaSurfaceTemperature=Sea surface temperature +observe.common.searchMaximum=Search maximum +observe.common.section=Section +observe.common.sensorBrand=Sensor brand +observe.common.sensorDataFormat=Sensor data format +observe.common.sensorSerialNo=Sensor serial no +observe.common.sensorType=Sensor type +observe.common.settingEndLatitude=Setting end latitude +observe.common.settingEndLongitude=Setting end longitude +observe.common.settingEndQuadrant=Setting end quadrant +observe.common.settingEndTimeStamp=Setting end timeStamp +observe.common.settingShape=Setting shape +observe.common.settingStartLatitude=Setting start latitude +observe.common.settingStartLongitude=Setting start longitude +observe.common.settingStartQuadrant=Setting start quadrant +observe.common.settingStartTimeStamp=Setting start timeStamp +observe.common.settingVesselSpeed=Setting vessel speed +observe.common.sex=Sex +observe.common.shooterSpeed=Shooter speed +observe.common.snapWeight=Snap weight +observe.common.species=Species +observe.common.speciesCatch=Species +observe.common.speciesFate=Species fate +observe.common.speciesGroup=Species group +observe.common.speciesStatus=Species status +observe.common.speedRange=Speed range +observe.common.startDate=Start date +observe.common.startLogValue=Start log value +observe.common.startTime=Sart time +observe.common.status=Status +observe.common.stomacFullness=Stomac fullness +observe.common.supportVesselName=Support vessel name +observe.common.surroundingActivity=Surrounding activity +observe.common.swivelWeight=Swivel weight +observe.common.time=Time +observe.common.timeBetweenHooks=Time between hooks +observe.common.topType=Top type +observe.common.totalBasketsCount=Total baskets count +observe.common.totalCount=Count +observe.common.totalHooksCount=Total hooks count +observe.common.totalSectionsCount=Total section count +observe.common.totalWeight=Total weight +observe.common.tracelineType=Traceline type +observe.common.transmittingBuoyOperation=Transmitting buoy operation +observe.common.transmittingBuoyType=Transmitting buoy type +observe.common.tripType=Trip type +observe.common.uri=Uri +observe.common.vessel=Boat +observe.common.vesselActivityLongline=Vessel activity +observe.common.vesselSizeCategory=Vessel size category +observe.common.vesselSpeed=Vessel spped +observe.common.vesselType=Vessel type +observe.common.waveHeight=Wave weight +observe.common.weight=Weight +observe.common.weightLengthFormula=Weight length formula +observe.common.wind=Wind +observe.common.wormsId=Worms id +observe.common.yearService=Year service validator.service.activity.bound.latitude=Latitude must be between %1$s and %2$s. validator.service.activity.bound.longitude=Longitude must be between %1$s and %2$s. validator.service.activity.bound.seaSurfaceTemperature=Temperature must be between %1$s and %2$s. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties index fe6ce12..6b0b736 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties @@ -1,3 +1,176 @@ +observe.common.activitySeine=Activité +observe.common.baitHaulingStatus=Statut appât au virage +observe.common.baitSettingStatus=Statut appât au filage +observe.common.baitType=Type d'appât +observe.common.basket=Panier +observe.common.basketsPerSectionCount=Nombre de panier par section +observe.common.branchline=Avançon +observe.common.branchlinesPerBasketCount=Nombre d'hameçons par panier +observe.common.brandName=Marque +observe.common.capacity=Capacité transport (m³) +observe.common.capacityLabel=Libellé capacité +observe.common.captain=Capitaine +observe.common.catchFateLongline=Devenir +observe.common.catchHealthness=Santé à la capture +observe.common.catchWeight=Poids estimé (en t) +observe.common.changeDate=Date changement pavillon +observe.common.code=Identifiant +observe.common.coefficients=Coefficients +observe.common.comment=Seules les espèces montées sur le pont pourront être échantillonnées +observe.common.count=Nombre +observe.common.country=Nationalité +observe.common.currentDirection=Direction du courant (°) +observe.common.currentSpeed=Vitesse du courant (nd) +observe.common.dataEntryOperator=Opérateur de saisie +observe.common.date=Jour d'observation +observe.common.daysAtSeaCount=Nombre de jours à l'eau +observe.common.departureHarbour=Port de départ +observe.common.deployementEnd=Fin déploiement +observe.common.description=Description +observe.common.detectionMode=Mode détection +observe.common.discardHealthness=Santé au rejet +observe.common.distance=Distance (m) +observe.common.encounterType=Type +observe.common.endDate=Date fin +observe.common.endLogValue=Loch du soir (milles) +observe.common.endPursingDate=Date de fin coulissage +observe.common.endPursingTimeStamp=Date - Heure de fin coulissage +observe.common.endSetDate=Date fin calée +observe.common.endSetTimeStamp=Date - Heure de fin de validité +observe.common.faoCode=Code FAO +observe.common.firstName=Prénom +observe.common.fishingEnd=Fin pêche +observe.common.fishingStart=Début pêche +observe.common.flagCountry=Pavillon +observe.common.fleetCountry=Flotte +observe.common.floatingObject=Objet flottant +observe.common.formsUrl=URL des formulaires +observe.common.fpaZone=Zone FPA +observe.common.gaugeLabel=Libellé jauge +observe.common.gear=Equipement +observe.common.gearCaracteristicType=Type de caractéristique +observe.common.gonadeWeight=Poids des gonades (g) +observe.common.haulingBreaks=Nombre de coupures +observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage +observe.common.haulingEndLatitude=Latitude de fin virage +observe.common.haulingEndLongitude=Longitude de fin virage +observe.common.haulingEndQuadrant=Quadrant de fin virage +observe.common.haulingEndTimeStamp=Horodatage fin +observe.common.haulingStartLatitude=Latitude de début de virage +observe.common.haulingStartLongitude=Longitude de début de virage +observe.common.haulingStartQuadrant=Quadrant de début de virage +observe.common.haulingStartTimeStamp=Horodatage début +observe.common.homeId=Id métier +observe.common.hookOffset=Offset hameçon (°) +observe.common.hookPosition=Position de l'hameçon +observe.common.hookSize=Taille d'hameçon +observe.common.hookType=Type d'hameçon +observe.common.individualSize=Taille (cm) +observe.common.individualWeight=Poids (kg) +observe.common.iso2Code=code ISO-2 +observe.common.iso3Code=Code ISO-3 +observe.common.itemHorizontalPosition=Position sur la ligne +observe.common.itemVerticalPosition=Position verticale +observe.common.keelCode=Code quille +observe.common.label1=Libellé anglais +observe.common.label2=Libellé français +observe.common.label3=Libellé espagnol +observe.common.landingHarbour=Port d'arrivée +observe.common.lastName=Nom +observe.common.latitude=Latitude +observe.common.length=Longueur (m) +observe.common.lengthWeightFormula=Relation Poids +observe.common.lightsticksColor=Couleur de cyalumes +observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier +observe.common.lightsticksType=Type de cyalumes +observe.common.lineType=Type de ligne +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturité sexuelle +observe.common.maxDepthTargeted=Profondeur maximum ciblée +observe.common.maxGearDepth=Profondeur maximum (m) +observe.common.meanLength=Taille moyenne (en cm) +observe.common.meanWeight=Poids moyen (en Kg) +observe.common.name=Nom +observe.common.number=Numéro +observe.common.objectFate=Devenir de l'objet +observe.common.objectOperation=Opération sur l'objet +observe.common.objectType=Type d'objet +observe.common.observedSystem=Système observé +observe.common.observedSystemDistance=Distance système observé (en milles avec 1 décimale) +observe.common.observer=Observateur +observe.common.ocean=Océan +observe.common.organism=Organisme +observe.common.power=Puissance moteur principal +observe.common.proportion=Proportion (%) +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Raison rejet +observe.common.reasonForNoFishing=Raison de non coup de Senne +observe.common.reasonForNullSet=Cause coup nul +observe.common.reportsUrl=URL de rapport +observe.common.route=Route +observe.common.schoolMeanDepth=Profondeur moyenne (m) +observe.common.schoolThickness=Épaisseur du banc (m) +observe.common.schoolTopDepth=Profondeur sommet (m) +observe.common.scientificLabel=Libellé scientifique +observe.common.seaSurfaceTemperature=Température surface (°) +observe.common.searchMaximum=Vitesse maximale +observe.common.section=Section +observe.common.sensorBrand=Marque +observe.common.sensorDataFormat=Format de données +observe.common.sensorSerialNo=Numéro de série +observe.common.sensorType=Type +observe.common.settingEndLatitude=Latitude de fin de filage +observe.common.settingEndLongitude=Longitude de fin de filage +observe.common.settingEndQuadrant=quadrant de fin de filage +observe.common.settingEndTimeStamp=Horodatage fin +observe.common.settingShape=Forme du filage +observe.common.settingStartLatitude=Latitude de début de filage +observe.common.settingStartLongitude=\=Longitude de début de filage +observe.common.settingStartQuadrant=quadrant de début de filage +observe.common.settingStartTimeStamp=Horodatage début +observe.common.settingVesselSpeed=Vitesse bateau (nd) +observe.common.sex=Sexe +observe.common.shooterSpeed=Vitesse shooter (nd) +observe.common.snapWeight=Poids snap (kg) +observe.common.species=Espèces +observe.common.speciesCatch=Espèce +observe.common.speciesFate=Devenir espèce +observe.common.speciesGroup=Groupe espèce +observe.common.speciesStatus=Statut faune observée +observe.common.speedRange=Libellé vitesse vent +observe.common.startDate=Date début +observe.common.startLogValue=Loch du matin (milles) +observe.common.startTime=Date - Heure de début de validité +observe.common.status=Statut +observe.common.stomacFullness=État de l'estomac +observe.common.supportVesselName=Nom supply +observe.common.surroundingActivity=Activité environnante +observe.common.swivelWeight=Poids de l'émerillon (kg) +observe.common.time=Heure +observe.common.timeBetweenHooks=Temps entre hameçons (s) +observe.common.topType=Type +observe.common.totalBasketsCount=Nombre de paniers +observe.common.totalCount=Nombre estimé +observe.common.totalHooksCount=Nombre total d'avançons +observe.common.totalSectionsCount=Nombre total de sections +observe.common.totalWeight=Poids total +observe.common.tracelineType=Type bas de ligne +observe.common.transmittingBuoyOperation=Opération balise +observe.common.transmittingBuoyType=Type de balise +observe.common.tripType=Type de marée +observe.common.uri=URI +observe.common.vessel=Navire +observe.common.vesselActivityLongline=Activité bateau +observe.common.vesselSizeCategory=Catégorie de bateau +observe.common.vesselSpeed=Vitesse bateau (nd) +observe.common.vesselType=Type de pêcherie +observe.common.waveHeight=Libellé Hauteur moyenne vagues +observe.common.weight=Poids (en t) +observe.common.weightLengthFormula=Relation Taille +observe.common.wind=Vent Beaufort +observe.common.wormsId=Worms +observe.common.yearService=Année de mise en service validator.service.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. validator.service.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. validator.service.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s et %2$s. diff --git a/services-topia-validation/src/test/resources/validators.xml b/services-topia-validation/src/test/resources/validators.xml index bcf946b..ce0ded5 100644 --- a/services-topia-validation/src/test/resources/validators.xml +++ b/services-topia-validation/src/test/resources/validators.xml @@ -52,14 +52,14 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.topia.validation.validators.ObserveCollectionUniqueKeyValidator"/> - <validator name="collectionUniqueKey" class="fr.ird.observe.services.topia.validation.validators.CollectionUniqueKeyValidator2"/> - <validator name="species_length" class="fr.ird.observe.services.topia.validation.validators.SpeciesLengthFieldValidator"/> - <validator name="species_weight" class="fr.ird.observe.services.topia.validation.validators.SpeciesWeightFieldValidator"/> - <validator name="activitySpeed" class="fr.ird.observe.services.topia.validation.validators.ActivitySpeedValidator"/> - <validator name="activitySimpleSpeed" class="fr.ird.observe.services.topia.validation.validators.ActivitySimpleSpeedValidator"/> - <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.topia.validation.validators.ActivityFinDeVeilleExistsValidator"/> - <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.topia.validation.validators.SetLonglineUniqueHomeIdValidator"/> - <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.topia.validation.validators.SetLonglineUniqueNumberValidator"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.topia.validators.ObserveCollectionUniqueKeyValidator"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.services.topia.validators.CollectionUniqueKeyValidator2"/> + <validator name="species_length" class="fr.ird.observe.services.topia.validators.SpeciesLengthFieldValidator"/> + <validator name="species_weight" class="fr.ird.observe.services.topia.validators.SpeciesWeightFieldValidator"/> + <validator name="activitySpeed" class="fr.ird.observe.services.topia.validators.ActivitySpeedValidator"/> + <validator name="activitySimpleSpeed" class="fr.ird.observe.services.topia.validators.ActivitySimpleSpeedValidator"/> + <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.topia.validators.ActivityFinDeVeilleExistsValidator"/> + <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueHomeIdValidator"/> + <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueNumberValidator"/> </validators> diff --git a/services-topia-validators/LICENSE.txt b/services-topia-validators/LICENSE.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/services-topia-validators/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-validators/README.md b/services-topia-validators/README.md new file mode 100644 index 0000000..e69de29 diff --git a/services-topia-validation/pom.xml b/services-topia-validators/pom.xml similarity index 51% copy from services-topia-validation/pom.xml copy to services-topia-validators/pom.xml index d081ee1..1cdf11c 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validators/pom.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - ObServe :: Business - - $HeadURL: https://svn.mpl.ird.fr/osiris/observe/trunk/observe-business/pom.xml $ + ObServe :: Swing %% Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit %% @@ -32,10 +30,14 @@ <version>5.0-SNAPSHOT</version> </parent> - <artifactId>services-topia-validation</artifactId> + <artifactId>services-topia-validators</artifactId> + + <name>ObServe :: Services ToPIA Validators</name> + <description>ObServe Services ToPIA Validators</description> - <name>ObServe :: Services ToPIA validation</name> - <description>ObServe Services ToPIA Validation module</description> + <properties> + + </properties> <dependencies> @@ -51,18 +53,6 @@ <artifactId>services-model</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>services-api</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - <!-- Nuiton --> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> <!-- commons --> <dependency> @@ -91,69 +81,6 @@ <artifactId>xwork-core</artifactId> </dependency> - <!-- test --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - </dependencies> - <build> - <resources> - - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserValidation</goal> - <goal>gen</goal> - </goals> - <configuration> - <entries> - <entry> - <specificGoal>parserValidation</specificGoal> - <basedir>${project.basedir}/src/main/resources/</basedir> - <includes> - <param>**/**-validation.xml</param> - </includes> - </entry> - </entries> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - - </build> - </project> diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/AbstractSpeciesFieldValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/AbstractSpeciesFieldValidator.java similarity index 99% rename from services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/AbstractSpeciesFieldValidator.java rename to services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/AbstractSpeciesFieldValidator.java index 17aa66e..1d6b974 100644 --- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/AbstractSpeciesFieldValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/AbstractSpeciesFieldValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validation.validators; +package fr.ird.observe.services.topia.validators; /* * #%L diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivityFinDeVeilleExistsValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivityFinDeVeilleExistsValidator.java similarity index 98% rename from services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivityFinDeVeilleExistsValidator.java rename to services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivityFinDeVeilleExistsValidator.java index 0bd4359..10cd4f7 100644 --- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivityFinDeVeilleExistsValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivityFinDeVeilleExistsValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validation.validators; +package fr.ird.observe.services.topia.validators; /* * #%L diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySimpleSpeedValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java similarity index 99% rename from services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySimpleSpeedValidator.java rename to services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java index 4552289..f5242ef 100644 --- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySimpleSpeedValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validation.validators; +package fr.ird.observe.services.topia.validators; /* * #%L diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java similarity index 99% rename from services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java rename to services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java index db74ae9..8f7ed1c 100644 --- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validation.validators; +package fr.ird.observe.services.topia.validators; /* * #%L diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/CollectionUniqueKeyValidator2.java similarity index 96% rename from services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java rename to services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/CollectionUniqueKeyValidator2.java index 1e572dc..83a3a9e 100644 --- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/CollectionUniqueKeyValidator2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validation.validators; +package fr.ird.observe.services.topia.validators; /* * #%L diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ObserveCollectionUniqueKeyValidator.java similarity index 99% rename from services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java rename to services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ObserveCollectionUniqueKeyValidator.java index 9e37b3c..fdeaabb 100644 --- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ObserveCollectionUniqueKeyValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validation.validators; +package fr.ird.observe.services.topia.validators; /* * #%L diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java similarity index 98% rename from services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java rename to services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java index 48379bd..6cde891 100644 --- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validation.validators; +package fr.ird.observe.services.topia.validators; /* * #%L diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java similarity index 98% rename from services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java rename to services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java index d89c982..48fb97e 100644 --- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validation.validators; +package fr.ird.observe.services.topia.validators; /* * #%L diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesLengthFieldValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesLengthFieldValidator.java similarity index 95% rename from services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesLengthFieldValidator.java rename to services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesLengthFieldValidator.java index 51958f4..193e081 100644 --- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesLengthFieldValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesLengthFieldValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validation.validators; +package fr.ird.observe.services.topia.validators; /* * #%L diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesWeightFieldValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesWeightFieldValidator.java similarity index 95% rename from services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesWeightFieldValidator.java rename to services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesWeightFieldValidator.java index f00a9c5..c9a50ab 100644 --- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SpeciesWeightFieldValidator.java +++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesWeightFieldValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validation.validators; +package fr.ird.observe.services.topia.validators; /* * #%L -- 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 5068aa30f30c294a61b7ea5fa7f2ff6be7b0ba73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 31 13:35:42 2016 +0200 update validators packages --- .../src/main/resources/validators.xml | 38 +++++++++++----------- application-web/src/main/resources/validators.xml | 18 +++++----- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/application-swing/src/main/resources/validators.xml b/application-swing/src/main/resources/validators.xml index 2f6b6d9..fe41bf4 100644 --- a/application-swing/src/main/resources/validators.xml +++ b/application-swing/src/main/resources/validators.xml @@ -52,27 +52,27 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> - <validator name="collectionUniqueKey" class="fr.ird.observe.services.topia.validation.validators.CollectionUniqueKeyValidator2"/> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.topia.validation.validators.ObserveCollectionUniqueKeyValidator"/> - <validator name="species_length" class="fr.ird.observe.services.topia.validation.validators.SpeciesLengthFieldValidator"/> - <validator name="species_weight" class="fr.ird.observe.services.topia.validation.validators.SpeciesWeightFieldValidator"/> - <validator name="activitySpeed" class="fr.ird.observe.services.topia.validation.validators.ActivitySpeedValidator"/> - <validator name="activitySimpleSpeed" class="fr.ird.observe.services.topia.validation.validators.ActivitySimpleSpeedValidator"/> - <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.topia.validation.validators.ActivityFinDeVeilleExistsValidator"/> - <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.topia.validation.validators.SetLonglineUniqueHomeIdValidator"/> - <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.topia.validation.validators.SetLonglineUniqueNumberValidator"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.services.topia.validators.CollectionUniqueKeyValidator2"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.topia.validators.ObserveCollectionUniqueKeyValidator"/> + <validator name="species_length" class="fr.ird.observe.services.topia.validators.SpeciesLengthFieldValidator"/> + <validator name="species_weight" class="fr.ird.observe.services.topia.validators.SpeciesWeightFieldValidator"/> + <validator name="activitySpeed" class="fr.ird.observe.services.topia.validators.ActivitySpeedValidator"/> + <validator name="activitySimpleSpeed" class="fr.ird.observe.services.topia.validators.ActivitySimpleSpeedValidator"/> + <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.topia.validators.ActivityFinDeVeilleExistsValidator"/> + <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueHomeIdValidator"/> + <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueNumberValidator"/> <!-- Les validateurs spécifique aux Dto dans observe --> - <validator name="collectionUniqueKeyDto" class="fr.ird.observe.application.swing.validation.validators.CollectionUniqueKeyDtoValidator"/> - <validator name="observeCollectionUniqueKeyDto" class="fr.ird.observe.application.swing.validation.validators.ObserveCollectionUniqueKeyDtoValidator"/> - <validator name="openableDto" class="fr.ird.observe.application.swing.validation.validators.OpenableDtoFieldValidator"/> - <validator name="species_lengthDto" class="fr.ird.observe.application.swing.validation.validators.SpeciesLengthFieldDtoValidator"/> - <validator name="species_weightDto" class="fr.ird.observe.application.swing.validation.validators.SpeciesWeightFieldDtoValidator"/> - <validator name="activitySpeedDto" class="fr.ird.observe.application.swing.validation.validators.ActivitySpeedDtoValidator"/> - <validator name="activitySimpleSpeedDto" class="fr.ird.observe.application.swing.validation.validators.ActivitySimpleSpeedDtoValidator"/> - <validator name="activityFinDeVeilleExistsDto" class="fr.ird.observe.application.swing.validation.validators.ActivityFinDeVeilleExistsDtoValidator"/> - <validator name="setLonglineUniqueHomeIdDto" class="fr.ird.observe.application.swing.validation.validators.SetLonglineUniqueHomeIdDtoValidator"/> - <validator name="setLonglineUniqueNumberDto" class="fr.ird.observe.application.swing.validation.validators.SetLonglineUniqueNumberDtoValidator"/> + <validator name="collectionUniqueKeyDto" class="fr.ird.observe.application.swing.validators.CollectionUniqueKeyDtoValidator"/> + <validator name="observeCollectionUniqueKeyDto" class="fr.ird.observe.application.swing.validators.ObserveCollectionUniqueKeyDtoValidator"/> + <validator name="openableDto" class="fr.ird.observe.application.swing.validators.OpenableDtoFieldValidator"/> + <validator name="species_lengthDto" class="fr.ird.observe.application.swing.validators.SpeciesLengthFieldDtoValidator"/> + <validator name="species_weightDto" class="fr.ird.observe.application.swing.validators.SpeciesWeightFieldDtoValidator"/> + <validator name="activitySpeedDto" class="fr.ird.observe.application.swing.validators.ActivitySpeedDtoValidator"/> + <validator name="activitySimpleSpeedDto" class="fr.ird.observe.application.swing.validators.ActivitySimpleSpeedDtoValidator"/> + <validator name="activityFinDeVeilleExistsDto" class="fr.ird.observe.application.swing.validators.ActivityFinDeVeilleExistsDtoValidator"/> + <validator name="setLonglineUniqueHomeIdDto" class="fr.ird.observe.application.swing.validators.SetLonglineUniqueHomeIdDtoValidator"/> + <validator name="setLonglineUniqueNumberDto" class="fr.ird.observe.application.swing.validators.SetLonglineUniqueNumberDtoValidator"/> diff --git a/application-web/src/main/resources/validators.xml b/application-web/src/main/resources/validators.xml index fa64553..cfebc8f 100644 --- a/application-web/src/main/resources/validators.xml +++ b/application-web/src/main/resources/validators.xml @@ -52,14 +52,14 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> - <validator name="collectionUniqueKey" class="fr.ird.observe.services.topia.validation.validators.CollectionUniqueKeyValidator2"/> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.topia.validation.validators.ObserveCollectionUniqueKeyValidator"/> - <validator name="species_length" class="fr.ird.observe.services.topia.validation.validators.SpeciesLengthFieldValidator"/> - <validator name="species_weight" class="fr.ird.observe.services.topia.validation.validators.SpeciesWeightFieldValidator"/> - <validator name="activitySpeed" class="fr.ird.observe.services.topia.validation.validators.ActivitySpeedValidator"/> - <validator name="activitySimpleSpeed" class="fr.ird.observe.services.topia.validation.validators.ActivitySimpleSpeedValidator"/> - <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.topia.validation.validators.ActivityFinDeVeilleExistsValidator"/> - <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.topia.validation.validators.SetLonglineUniqueHomeIdValidator"/> - <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.topia.validation.validators.SetLonglineUniqueNumberValidator"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.services.topia.validators.CollectionUniqueKeyValidator2"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.topia.validators.ObserveCollectionUniqueKeyValidator"/> + <validator name="species_length" class="fr.ird.observe.services.topia.validators.SpeciesLengthFieldValidator"/> + <validator name="species_weight" class="fr.ird.observe.services.topia.validators.SpeciesWeightFieldValidator"/> + <validator name="activitySpeed" class="fr.ird.observe.services.topia.validators.ActivitySpeedValidator"/> + <validator name="activitySimpleSpeed" class="fr.ird.observe.services.topia.validators.ActivitySimpleSpeedValidator"/> + <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.topia.validators.ActivityFinDeVeilleExistsValidator"/> + <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueHomeIdValidator"/> + <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueNumberValidator"/> </validators> -- 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 33fe52370c253002f349bc3db73efa602a7072c3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 31 14:02:26 2016 +0200 use last nuiton-utils version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b93b1ef..b240d43 100644 --- a/pom.xml +++ b/pom.xml @@ -276,7 +276,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-13</version> + <version>3.0-rc-14</version> <scope>compile</scope> <exclusions> <exclusion> -- 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 0a6dd46e0b466c1718c30b6b5fce38234a8a3729 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 31 15:18:15 2016 +0200 all trads are in ! --- application-swing-validation/pom.xml | 28 +++- .../application-swing-validation_es_ES.properties | 180 +++++++++++++++++++++ services-topia-validation/pom.xml | 30 +++- .../services-topia-validation_es_ES.properties | 173 ++++++++++++++++++++ 4 files changed, 397 insertions(+), 14 deletions(-) diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 5afcd21..56d5558 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -153,28 +153,42 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>scan-sources</id> + <id>parse-java</id> <goals> <goal>parserJava</goal> + </goals> + <configuration> + <treateDefaultEntry>false</treateDefaultEntry> + <entries> + <entry> + <specificGoal>parserJava</specificGoal> + <basedir>${project.build.directory}/generated-sources/java</basedir> + </entry> + </entries> + </configuration> + </execution> + <execution> + <id>parse-validation</id> + <goals> <goal>parserValidation</goal> - <goal>gen</goal> </goals> <configuration> <entries> <entry> - <specificGoal>parserValidation</specificGoal> <basedir>${project.basedir}/src/main/resources/</basedir> <includes> <param>**/**-validation.xml</param> </includes> </entry> - <entry> - <specificGoal>parserJava</specificGoal> - <basedir>${project.build.directory}/generated-sources/java</basedir> - </entry> </entries> </configuration> </execution> + <execution> + <id>gen</id> + <goals> + <goal>gen</goal> + </goals> + </execution> </executions> </plugin> 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 487b3f6..90cf79c 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 @@ -1,3 +1,183 @@ +observe.common.activityLongline=Actividad +observe.common.activitySeine=Actividad +observe.common.baitHaulingStatus=Estatuto del cebo en el arrastre +observe.common.baitSettingStatus=Estatuto del cebo en la calada +observe.common.baitType=Tipo de cebo +observe.common.basket=Cesta +observe.common.basketsPerSectionCount=Número de cestas por sección +observe.common.branchline=Arponcillo +observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta +observe.common.brandName=Marca +observe.common.capacity=Capacidad de transporte +observe.common.capacityLabel=Texto capacidad +observe.common.captain=Capitán +observe.common.catchFateLongline=Futuro de la captura +observe.common.catchHealthness=Salud a la captura +observe.common.catchWeight=Peso estimado (en t) +observe.common.changeDate=Fecha de carga +observe.common.code=Identificación +observe.common.coefficients=Coeficientes +observe.common.comment=Comentarios +observe.common.count=Número +observe.common.country=País +observe.common.currentDirection=Direction du courant (°) +observe.common.currentFpaZone=Zona FPA actual +observe.common.currentSpeed=Velocidad del corriente (nd) +observe.common.dataEntryOperator=Operador de captación de datos +observe.common.date=Día de observación +observe.common.daysAtSeaCount=Numero de días en el mar +observe.common.departureHarbour=Puerto de origen +observe.common.deployementEnd=Fin de despliegue +observe.common.description=Descripción +observe.common.detectionMode=Modo de detección +observe.common.discardHealthness=Salud al rechazo +observe.common.distance=Distancia (m) +observe.common.encounterType=Tipo de encuentro +observe.common.endDate=Fecha de fin +observe.common.endLogValue=Corredera de tarde (millas) +observe.common.endPursingDate=Fecha de fin de calado de la red +observe.common.endPursingTimeStamp=Fecha - Hora de fin de calado de la red +observe.common.endSetDate=Fecha de fin de calado de la red +observe.common.endSetTimeStamp=Fecha - Hora de fin de validez +observe.common.faoCode=Codigo FAO +observe.common.firstName=Número +observe.common.fishingEnd=Fin de pesca +observe.common.fishingStart=Inicio de pesca +observe.common.flagCountry=Badera +observe.common.fleetCountry=País +observe.common.floatingObjectEmpty=Objeto flotante vacía +observe.common.formsUrl=URL de los formularios +observe.common.fpaZone=Zona FPA +observe.common.gaugeLabel=Texto «Capacidad» +observe.common.gear=Equipamiento +observe.common.gearCaracteristicType=Tipo de característica de equipamientos +observe.common.gearType=Tipo de arte de pesca +observe.common.gearUseFeaturesLongline=Equipamiento +observe.common.gearUseFeaturesSeine=Equipamiento +observe.common.gonadeWeight=Peso de las gonadas (g) +observe.common.haulingBreaks=Número de cortes +observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada +observe.common.haulingEndLatitude=Arrastre Latitude +observe.common.haulingEndLongitude=Arrastre Longitud +observe.common.haulingEndTimeStamp=Timestamp de fin +observe.common.haulingStartLatitude=Arrastre Latitude +observe.common.haulingStartLongitude=Arrastre Longitud +observe.common.haulingStartTimeStamp=Timestamp del inicio +observe.common.homeId=Id de negocio +observe.common.hookOffset=Offset anzuelo (°) +observe.common.hookPosition=Posición del anzuelo +observe.common.hookSize=Tamaño +observe.common.hookType=Tipo de anzuelo +observe.common.individualSize=Tamaño (cm) +observe.common.individualWeight=Peso (kg) +observe.common.iso2Code=Código ISO-2 +observe.common.iso3Code=Código ISO-3 +observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal +observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo +observe.common.keelCode=Código de Quilla +observe.common.label1=Texto en inglés +observe.common.label2=Texto en francés +observe.common.label3=Nombre +observe.common.landingHarbour=Puerto de destino +observe.common.lastName=Nombre +observe.common.latitude=Latitude +observe.common.length=Longitud eslora total +observe.common.lengthWeightFormula=Relación Peso +observe.common.lightsticksColor=Color de barrita de luz +observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta +observe.common.lightsticksType=Tipo de barrita de luz +observe.common.lineType=Tipo de línea +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturidad +observe.common.maxDepthTargeted=Profundidad máxima deseada +observe.common.maxGearDepth=Profundidad máxima (m) +observe.common.meanLength=Talla media (en cm) +observe.common.meanWeight=Peso medio (en Kg) +observe.common.name=Nombre +observe.common.nextFpaZone=Zona FPA penetrada +observe.common.nonTargetCatch=Fauna accesoria conservada o descartada +observe.common.number=Número +observe.common.objectFate=Futuro del objeto +observe.common.objectOperation=Operación sobre el objeto +observe.common.objectType=Tipo de objeto +observe.common.observedSystem=Système observé +observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) +observe.common.observedSystemEmpty=Sistema observado vacía +observe.common.observer=Observador +observe.common.ocean=Oceano +observe.common.organism=Organismo +observe.common.power=Potencia del motor principal +observe.common.previousFpaZone=La zona FPA de que se salió +observe.common.proportion=Proporción (%) +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Razón de descarte +observe.common.reasonForNoFishing=Razón de no pesca Senne +observe.common.reasonForNullSet=Causa de lance nulo +observe.common.reportsUrl=URL del informe +observe.common.route=Ruta +observe.common.schoolEstimate=Estimación banco +observe.common.schoolMeanDepth=Profundidad media (m) +observe.common.schoolThickness=Grossor del banco (m) +observe.common.schoolTopDepth=Profundidad de la cumbre (m) +observe.common.scientificLabel=Título científico +observe.common.seaSurfaceTemperature=Temperatura en superficie (°) +observe.common.searchMaximum=Velocidad máxima de prospección +observe.common.section=Sección +observe.common.sensorBrand=Marca de sensor +observe.common.sensorDataFormat=Formato de los datos del sensor +observe.common.sensorSerialNo=Número de serie +observe.common.sensorType=Tipo de sensor +observe.common.settingEndLatitude=Calada latitude +observe.common.settingEndLongitude=Calada longitud +observe.common.settingEndTimeStamp=Timestamp de fin +observe.common.settingShape=Forma de la calada +observe.common.settingStartLatitude=Calada latitude +observe.common.settingStartLongitude=Calada longitud +observe.common.settingStartTimeStamp=Timestamp de inicio +observe.common.settingVesselSpeed=Velocidad del barco (nd) +observe.common.sex=Sexo +observe.common.shooterSpeed=Velocidad shooter (nd) +observe.common.snapWeight=Peso snap (kg) +observe.common.species=Especie +observe.common.speciesCatch=Especie +observe.common.speciesFate=Futuro de la especie +observe.common.speciesGroup=Grupo de especie +observe.common.speciesStatus=Estatuto de la fauna observada +observe.common.speedRange=Texto velocidad del viento +observe.common.startDate=Fecha de comienzo +observe.common.startLogValue=Corredera de mañana (millas) +observe.common.startTime=Fecha - Heuro de inicio de validez +observe.common.status=Estado +observe.common.stomacFullness=Nivel de llenado del estomago +observe.common.supportVesselName=Nombre del supply +observe.common.surroundingActivity=Actividad circundante +observe.common.swivelWeight=Peso de el destorcedor (kg) +observe.common.time=Hora +observe.common.timeBetweenHooks=Temps entre anzuelos (s) +observe.common.topType=Tipo parte superior +observe.common.totalBasketsCount=Número total de baskets +observe.common.totalCount=Número estimado +observe.common.totalHooksCount=Número total d'arponcillos +observe.common.totalSectionsCount=Número total de secciones +observe.common.totalWeight=Peso +observe.common.tracelineType=Tipo bajo de línea +observe.common.transmittingBuoyOperation=Operación baliza +observe.common.transmittingBuoyType=Tipo de baliza +observe.common.tripType=Tipo de marea +observe.common.uri=URI +observe.common.vessel=Buque +observe.common.vesselActivityLongline=Actividad buque +observe.common.vesselActivitySeine=Actividad buque +observe.common.vesselSizeCategory=Categoría de buque +observe.common.vesselSpeed=Velocidad del barco (nd) +observe.common.vesselType=Tipo de pesquería +observe.common.waveHeight=Texto descriptivo de «altura media de la ola» +observe.common.weight=Peso (en t) +observe.common.weightLengthFormula=Relación de tallas +observe.common.wind=Viento Beaufort +observe.common.wormsId=Worms +observe.common.yearService=año de entrada en servicio validator.ui.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. validator.ui.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. validator.ui.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s y %2$s. diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index f51eda8..633ec59 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -168,29 +168,45 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> + <id>parse-java</id> <goals> - <goal>parserValidation</goal> <goal>parserJava</goal> - <goal>gen</goal> + </goals> + <configuration> + <treateDefaultEntry>false</treateDefaultEntry> + <entries> + <entry> + <specificGoal>parserJava</specificGoal> + <basedir>${project.build.directory}/generated-sources/java</basedir> + </entry> + </entries> + </configuration> + </execution> + <execution> + <id>parse-validation</id> + <goals> + <goal>parserValidation</goal> </goals> <configuration> <entries> <entry> - <specificGoal>parserValidation</specificGoal> <basedir>${project.basedir}/src/main/resources/</basedir> <includes> <param>**/**-validation.xml</param> </includes> </entry> - <entry> - <specificGoal>parserJava</specificGoal> - <basedir>${project.build.directory}/generated-sources/java</basedir> - </entry> </entries> </configuration> </execution> + <execution> + <id>gen</id> + <goals> + <goal>gen</goal> + </goals> + </execution> </executions> </plugin> + </plugins> </build> diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties index a3c4f86..3c1a868 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties @@ -1,3 +1,176 @@ +observe.common.activitySeine=Actividad +observe.common.baitHaulingStatus=Estatuto del cebo en el arrastre +observe.common.baitSettingStatus=Estatuto del cebo en la calada +observe.common.baitType=Tipo de cebo +observe.common.basket=Cesta +observe.common.basketsPerSectionCount=Número de cestas por sección +observe.common.branchline=Arponcillo +observe.common.branchlinesPerBasketCount=Número de anzuelos por cesta +observe.common.brandName=Marca +observe.common.capacity=Capacidad de transporte +observe.common.capacityLabel=Texto capacidad +observe.common.captain=Capitán +observe.common.catchFateLongline=Futuro de la captura +observe.common.catchHealthness=Salud a la captura +observe.common.catchWeight=Peso estimado (en t) +observe.common.changeDate=Fecha de carga +observe.common.code=Identificación +observe.common.coefficients=Coeficientes +observe.common.comment=Comentarios +observe.common.count=Número +observe.common.country=País +observe.common.currentDirection=Direction du courant (°) +observe.common.currentSpeed=Velocidad del corriente (nd) +observe.common.dataEntryOperator=Operador de captación de datos +observe.common.date=Día de observación +observe.common.daysAtSeaCount=Numero de días en el mar +observe.common.departureHarbour=Puerto de origen +observe.common.deployementEnd=Fin de despliegue +observe.common.description=Descripción +observe.common.detectionMode=Modo de detección +observe.common.discardHealthness=Salud al rechazo +observe.common.distance=Distancia (m) +observe.common.encounterType=Tipo de encuentro +observe.common.endDate=Fecha de fin +observe.common.endLogValue=Corredera de tarde (millas) +observe.common.endPursingDate=Fecha de fin de calado de la red +observe.common.endPursingTimeStamp=Fecha - Hora de fin de calado de la red +observe.common.endSetDate=Fecha de fin de calado de la red +observe.common.endSetTimeStamp=Fecha - Hora de fin de validez +observe.common.faoCode=Codigo FAO +observe.common.firstName=Número +observe.common.fishingEnd=Fin de pesca +observe.common.fishingStart=Inicio de pesca +observe.common.flagCountry=Badera +observe.common.fleetCountry=País +observe.common.floatingObject=Objeto flotante +observe.common.formsUrl=URL de los formularios +observe.common.fpaZone=Zona FPA +observe.common.gaugeLabel=Texto «Capacidad» +observe.common.gear=Equipamiento +observe.common.gearCaracteristicType=Tipo de característica de equipamientos +observe.common.gonadeWeight=Peso de las gonadas (g) +observe.common.haulingBreaks=Número de cortes +observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada +observe.common.haulingEndLatitude=Arrastre Latitude +observe.common.haulingEndLongitude=Arrastre Longitud +observe.common.haulingEndQuadrant=Arrastre Quadrant +observe.common.haulingEndTimeStamp=Timestamp de fin +observe.common.haulingStartLatitude=Arrastre Latitude +observe.common.haulingStartLongitude=Arrastre Longitud +observe.common.haulingStartQuadrant=Arrastre Quadrant +observe.common.haulingStartTimeStamp=Timestamp del inicio +observe.common.homeId=Id de negocio +observe.common.hookOffset=Offset anzuelo (°) +observe.common.hookPosition=Posición del anzuelo +observe.common.hookSize=Tamaño +observe.common.hookType=Tipo de anzuelo +observe.common.individualSize=Tamaño (cm) +observe.common.individualWeight=Peso (kg) +observe.common.iso2Code=Código ISO-2 +observe.common.iso3Code=Código ISO-3 +observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal +observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo +observe.common.keelCode=Código de Quilla +observe.common.label1=Texto en inglés +observe.common.label2=Texto en francés +observe.common.label3=Nombre +observe.common.landingHarbour=Puerto de destino +observe.common.lastName=Nombre +observe.common.latitude=Latitude +observe.common.length=Longitud eslora total +observe.common.lengthWeightFormula=Relación Peso +observe.common.lightsticksColor=Color de barrita de luz +observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta +observe.common.lightsticksType=Tipo de barrita de luz +observe.common.lineType=Tipo de línea +observe.common.locode=Locode +observe.common.longitude=Longitude +observe.common.maturityStatus=Maturidad +observe.common.maxDepthTargeted=Profundidad máxima deseada +observe.common.maxGearDepth=Profundidad máxima (m) +observe.common.meanLength=Talla media (en cm) +observe.common.meanWeight=Peso medio (en Kg) +observe.common.name=Nombre +observe.common.number=Número +observe.common.objectFate=Futuro del objeto +observe.common.objectOperation=Operación sobre el objeto +observe.common.objectType=Tipo de objeto +observe.common.observedSystem=Système observé +observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) +observe.common.observer=Observador +observe.common.ocean=Oceano +observe.common.organism=Organismo +observe.common.power=Potencia del motor principal +observe.common.proportion=Proporción (%) +observe.common.quadrant=Quadrant +observe.common.reasonForDiscard=Razón de descarte +observe.common.reasonForNoFishing=Razón de no pesca Senne +observe.common.reasonForNullSet=Causa de lance nulo +observe.common.reportsUrl=URL del informe +observe.common.route=Ruta +observe.common.schoolMeanDepth=Profundidad media (m) +observe.common.schoolThickness=Grossor del banco (m) +observe.common.schoolTopDepth=Profundidad de la cumbre (m) +observe.common.scientificLabel=Título científico +observe.common.seaSurfaceTemperature=Temperatura en superficie (°) +observe.common.searchMaximum=Velocidad máxima de prospección +observe.common.section=Sección +observe.common.sensorBrand=Marca de sensor +observe.common.sensorDataFormat=Formato de los datos del sensor +observe.common.sensorSerialNo=Número de serie +observe.common.sensorType=Tipo de sensor +observe.common.settingEndLatitude=Calada latitude +observe.common.settingEndLongitude=Calada longitud +observe.common.settingEndQuadrant=Calada quadrant +observe.common.settingEndTimeStamp=Timestamp de fin +observe.common.settingShape=Forma de la calada +observe.common.settingStartLatitude=Calada latitude +observe.common.settingStartLongitude=Calada longitud +observe.common.settingStartQuadrant=Calada quadrant +observe.common.settingStartTimeStamp=Timestamp de inicio +observe.common.settingVesselSpeed=Velocidad del barco (nd) +observe.common.sex=Sexo +observe.common.shooterSpeed=Velocidad shooter (nd) +observe.common.snapWeight=Peso snap (kg) +observe.common.species=Especie +observe.common.speciesCatch=Especie +observe.common.speciesFate=Futuro de la especie +observe.common.speciesGroup=Grupo de especie +observe.common.speciesStatus=Estatuto de la fauna observada +observe.common.speedRange=Texto velocidad del viento +observe.common.startDate=Fecha de comienzo +observe.common.startLogValue=Corredera de mañana (millas) +observe.common.startTime=Fecha - Heuro de inicio de validez +observe.common.status=Estado +observe.common.stomacFullness=Nivel de llenado del estomago +observe.common.supportVesselName=Nombre del supply +observe.common.surroundingActivity=Actividad circundante +observe.common.swivelWeight=Peso de el destorcedor (kg) +observe.common.time=Hora +observe.common.timeBetweenHooks=Temps entre anzuelos (s) +observe.common.topType=Tipo parte superior +observe.common.totalBasketsCount=Número total de baskets +observe.common.totalCount=Número estimado +observe.common.totalHooksCount=Número total d'arponcillos +observe.common.totalSectionsCount=Número total de secciones +observe.common.totalWeight=Peso +observe.common.tracelineType=Tipo bajo de línea +observe.common.transmittingBuoyOperation=Operación baliza +observe.common.transmittingBuoyType=Tipo de baliza +observe.common.tripType=Tipo de marea +observe.common.uri=URI +observe.common.vessel=Buque +observe.common.vesselActivityLongline=Actividad buque +observe.common.vesselSizeCategory=Categoría de buque +observe.common.vesselSpeed=Velocidad del barco (nd) +observe.common.vesselType=Tipo de pesquería +observe.common.waveHeight=Texto descriptivo de «altura media de la ola» +observe.common.weight=Peso (en t) +observe.common.weightLengthFormula=Relación de tallas +observe.common.wind=Viento Beaufort +observe.common.wormsId=Worms +observe.common.yearService=año de entrada en servicio validator.service.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. validator.service.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. validator.service.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s y %2$s. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.