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 4dc3f77dcd1ddca7b5a6b3dfb832fcbcf32113d4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 27 12:31:16 2016 +0200 Suppression des validateurs en mode create au niveau de la validation serveur (cela n'a aucun sens de les conserver) --- ...ActivityLongline-n1-create-error-validation.xml | 200 ------- ...tivityLongline-n1-create-warning-validation.xml | 57 -- .../SetLongline-n1-create-error-validation.xml | 638 --------------------- .../SetLongline-n1-create-warning-validation.xml | 38 -- .../TripLongline-n1-create-error-validation.xml | 249 -------- .../TripLongline-n1-create-warning-validation.xml | 54 -- .../Country-n1-create-error-validation.xml | 109 ---- .../Country-n1-create-warning-validation.xml | 67 --- .../FpaZone-n1-create-error-validation.xml | 73 --- .../FpaZone-n1-create-warning-validation.xml | 80 --- .../Gear-n1-create-error-validation.xml | 75 --- .../Gear-n1-create-warning-validation.xml | 67 --- ...earCaracteristic-n1-create-error-validation.xml | 90 --- ...rCaracteristic-n1-create-warning-validation.xml | 67 --- ...aracteristicType-n1-create-error-validation.xml | 75 --- ...acteristicType-n1-create-warning-validation.xml | 67 --- .../Harbour-n1-create-error-validation.xml | 75 --- .../Harbour-n1-create-warning-validation.xml | 67 --- ...hWeightParameter-n1-create-error-validation.xml | 137 ----- ...eightParameter-n1-create-warning-validation.xml | 69 --- .../Ocean-n1-create-error-validation.xml | 74 --- .../Ocean-n1-create-warning-validation.xml | 67 --- .../Organism-n1-create-error-validation.xml | 88 --- .../Organism-n1-create-warning-validation.xml | 74 --- .../Person-n1-create-error-validation.xml | 81 --- .../Person-n1-create-warning-validation.xml | 46 -- .../Program-n1-create-error-validation.xml | 96 ---- .../Program-n1-create-warning-validation.xml | 91 --- .../referentiel/Sex-n1-create-error-validation.xml | 73 --- .../Sex-n1-create-warning-validation.xml | 65 --- .../Species-n1-create-error-validation.xml | 138 ----- .../Species-n1-create-warning-validation.xml | 90 --- .../SpeciesGroup-n1-create-error-validation.xml | 74 --- .../SpeciesGroup-n1-create-warning-validation.xml | 67 --- .../SpeciesList-n1-create-error-validation.xml | 75 --- .../SpeciesList-n1-create-warning-validation.xml | 75 --- .../Vessel-n1-create-error-validation.xml | 134 ----- .../Vessel-n1-create-warning-validation.xml | 127 ---- ...sselSizeCategory-n1-create-error-validation.xml | 67 --- ...elSizeCategory-n1-create-warning-validation.xml | 46 -- .../VesselType-n1-create-error-validation.xml | 74 --- .../VesselType-n1-create-warning-validation.xml | 67 --- ...aitHaulingStatus-n1-create-error-validation.xml | 75 --- ...tHaulingStatus-n1-create-warning-validation.xml | 68 --- ...aitSettingStatus-n1-create-error-validation.xml | 75 --- ...tSettingStatus-n1-create-warning-validation.xml | 68 --- .../BaitType-n1-create-error-validation.xml | 75 --- .../BaitType-n1-create-warning-validation.xml | 68 --- ...atchFateLongline-n1-create-error-validation.xml | 75 --- ...chFateLongline-n1-create-warning-validation.xml | 68 --- .../EncounterType-n1-create-error-validation.xml | 75 --- .../EncounterType-n1-create-warning-validation.xml | 68 --- .../Healthness-n1-create-error-validation.xml | 75 --- .../Healthness-n1-create-warning-validation.xml | 68 --- .../HookPosition-n1-create-error-validation.xml | 75 --- .../HookPosition-n1-create-warning-validation.xml | 68 --- .../HookSize-n1-create-error-validation.xml | 75 --- .../HookSize-n1-create-warning-validation.xml | 68 --- .../HookType-n1-create-error-validation.xml | 75 --- .../HookType-n1-create-warning-validation.xml | 68 --- ...rizontalPosition-n1-create-error-validation.xml | 75 --- ...zontalPosition-n1-create-warning-validation.xml | 68 --- ...VerticalPosition-n1-create-error-validation.xml | 75 --- ...rticalPosition-n1-create-warning-validation.xml | 68 --- ...LightsticksColor-n1-create-error-validation.xml | 75 --- ...ghtsticksColor-n1-create-warning-validation.xml | 68 --- .../LightsticksType-n1-create-error-validation.xml | 75 --- ...ightsticksType-n1-create-warning-validation.xml | 68 --- .../LineType-n1-create-error-validation.xml | 75 --- .../LineType-n1-create-warning-validation.xml | 68 --- .../MaturityStatus-n1-create-error-validation.xml | 75 --- ...MaturityStatus-n1-create-warning-validation.xml | 68 --- .../MitigationType-n1-create-error-validation.xml | 75 --- ...MitigationType-n1-create-warning-validation.xml | 68 --- .../SensorBrand-n1-create-error-validation.xml | 61 -- .../SensorBrand-n1-create-warning-validation.xml | 47 -- ...SensorDataFormat-n1-create-error-validation.xml | 75 --- ...nsorDataFormat-n1-create-warning-validation.xml | 68 --- .../SensorType-n1-create-error-validation.xml | 75 --- .../SensorType-n1-create-warning-validation.xml | 68 --- .../SettingShape-n1-create-error-validation.xml | 75 --- .../SettingShape-n1-create-warning-validation.xml | 68 --- .../SizeMeasureType-n1-create-error-validation.xml | 75 --- ...izeMeasureType-n1-create-warning-validation.xml | 68 --- .../StomacFullness-n1-create-error-validation.xml | 75 --- ...StomacFullness-n1-create-warning-validation.xml | 68 --- .../TripType-n1-create-error-validation.xml | 75 --- .../TripType-n1-create-warning-validation.xml | 68 --- ...ActivityLongline-n1-create-error-validation.xml | 75 --- ...tivityLongline-n1-create-warning-validation.xml | 68 --- ...eightMeasureType-n1-create-error-validation.xml | 75 --- ...ghtMeasureType-n1-create-warning-validation.xml | 68 --- .../DetectionMode-n1-create-error-validation.xml | 74 --- .../DetectionMode-n1-create-warning-validation.xml | 67 --- .../ObjectFate-n1-create-error-validation.xml | 74 --- .../ObjectFate-n1-create-warning-validation.xml | 67 --- .../ObjectOperation-n1-create-error-validation.xml | 74 --- ...bjectOperation-n1-create-warning-validation.xml | 67 --- .../ObjectType-n1-create-error-validation.xml | 74 --- .../ObjectType-n1-create-warning-validation.xml | 67 --- .../ObservedSystem-n1-create-error-validation.xml | 74 --- ...ObservedSystem-n1-create-warning-validation.xml | 67 --- ...ReasonForDiscard-n1-create-error-validation.xml | 74 --- ...asonForDiscard-n1-create-warning-validation.xml | 67 --- ...asonForNoFishing-n1-create-error-validation.xml | 74 --- ...onForNoFishing-n1-create-warning-validation.xml | 67 --- ...ReasonForNullSet-n1-create-error-validation.xml | 74 --- ...asonForNullSet-n1-create-warning-validation.xml | 67 --- .../SpeciesFate-n1-create-error-validation.xml | 74 --- .../SpeciesFate-n1-create-warning-validation.xml | 67 --- .../SpeciesStatus-n1-create-error-validation.xml | 74 --- .../SpeciesStatus-n1-create-warning-validation.xml | 67 --- ...roundingActivity-n1-create-error-validation.xml | 74 --- ...undingActivity-n1-create-warning-validation.xml | 67 --- ...ingBuoyOperation-n1-create-error-validation.xml | 74 --- ...gBuoyOperation-n1-create-warning-validation.xml | 67 --- ...smittingBuoyType-n1-create-error-validation.xml | 74 --- ...ittingBuoyType-n1-create-warning-validation.xml | 67 --- ...selActivitySeine-n1-create-error-validation.xml | 74 --- ...lActivitySeine-n1-create-warning-validation.xml | 67 --- .../WeightCategory-n1-create-error-validation.xml | 89 --- ...WeightCategory-n1-create-warning-validation.xml | 67 --- .../seine/Wind-n1-create-error-validation.xml | 89 --- .../seine/Wind-n1-create-warning-validation.xml | 67 --- .../ActivitySeine-n1-create-error-validation.xml | 343 ----------- .../ActivitySeine-n1-create-warning-validation.xml | 111 ---- .../FloatingObject-n1-create-error-validation.xml | 112 ---- ...FloatingObject-n1-create-warning-validation.xml | 55 -- .../seine/Route-n1-create-error-validation.xml | 65 --- .../seine/Route-n1-create-warning-validation.xml | 59 -- .../seine/SetSeine-n1-create-error-validation.xml | 198 ------- .../SetSeine-n1-create-warning-validation.xml | 51 -- .../seine/TripSeine-n1-create-error-validation.xml | 243 -------- .../TripSeine-n1-create-warning-validation.xml | 54 -- .../validation/BeanValidatorDetectorTest.java | 78 +-- 135 files changed, 4 insertions(+), 11334 deletions(-) diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml deleted file mode 100644 index 59ea2d5..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml +++ /dev/null @@ -1,200 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="vesselActivityLongline"> - - <!-- pas de vesselActivityLongline selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.vesselActivity</message> - </field-validator> - - <!-- vesselActivityLongline desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ vesselActivityLongline.enabled ]]> - </param> - <message>validator.activity.desactivated.vesselActivity</message> - </field-validator> - - </field> - - <field name="date"> - - <!-- pas de date selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.date</message> - </field-validator> - - </field> - - <field name="time"> - - <!-- pas d'heure d'observation selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.time</message> - </field-validator> - - <!-- heure observation non duplique --> - <!--field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ - routeEntity.isTimeAvailable(topiaId, time) - ]]> - </param> - <message>validator.activity.duplicated.time</message> - </field-validator--> - - <!--field-validator type="activitySimpleSpeed" short-circuit="true"> - <param name="speed">30.0</param> - <message>validator.activity.invalid.speed##${foundSpeed}##${speed}</message> - </field-validator--> - - </field> - - <field name="quadrant"> - - <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.quadrant</message> - </field-validator> - - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - tripLonglineEntity.ocean == null || quadrant == null || quadrant == 0 - || (tripLonglineEntity.ocean.code == 3) - || (tripLonglineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (tripLonglineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) - ]]> - </param> - <message> - validator.activity.invalid.quadrant##${tripLonglineEntity.ocean.libelle} - </message> - </field-validator> - - </field> - - <field name="seaSurfaceTemperature"> - - <!-- temperature surface non saisie || 12.0 <= temperature surface <= 35.0 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:12.0|max:35.0</param> - <param name="expression"> - <![CDATA[ seaSurfaceTemperature == null || (doubles.min <= seaSurfaceTemperature && seaSurfaceTemperature <= doubles.max)]]> - </param> - <message> - validator.activity.bound.seaSurfaceTemperature##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="latitude"> - - <!-- latitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.latitude</message> - </field-validator> - - <!-- 0 <= latitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:90.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(latitude) && @java.lang.Math@abs(latitude) <= doubles.max) - ]]> - </param> - <message> - validator.activity.bound.latitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="longitude"> - - <!-- longitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.longitude</message> - </field-validator> - - <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:180.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(longitude) && @java.lang.Math@abs(longitude) <= doubles.max) - ]]> - </param> - <message> - validator.activity.bound.longitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="comment"> - <!-- comentaire de moins de 1024 caractères --> - <field-validator type="stringlength"> - <param name="maxLength">1024</param> - <message>validator.activity.comment.tobig</message> - </field-validator> - - <!-- comentaire requis pour le type d'activity vessel selectionne --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ vesselActivityLongline == null || !vesselActivityLongline.needComment || (comment != null && !comment.empty) ]]> - </param> - <message> - validator.activity.required.comment.for.vesselActivity - </message> - </field-validator> - - <!-- comentaire requis pour fpaZone --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ fpaZone == null || !fpaZone.needComment || (comment != null && !comment.empty) ]]> - </param> - <message> - validator.activity.required.comment.for.fpaZone - </message> - </field-validator> - - </field> - - <field name="fpaZone"> - - <!-- fpaZone desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ fpaZone == null || fpaZone.enabled ]]> - </param> - <message>validator.activityLongline.desactivated.fpaZone</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-warning-validation.xml deleted file mode 100644 index 47632be..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-warning-validation.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="quadrant"> - - <!-- pas de quadrant selectionne --> - <field-validator type="int" short-circuit="true"> - <param name="min">1</param> - <message>validator.activity.required.quadrant</message> - </field-validator> - - </field> - - <field name="seaSurfaceTemperature"> - - <!-- temperature surface non saisie --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.null.seaSurfaceTemperature</message> - </field-validator> - - </field> - - <field name="fpaZone"> - - <!-- fpaZone non saisie --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.null.fpaZone</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml deleted file mode 100644 index 19fb1fd..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml +++ /dev/null @@ -1,638 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="homeId"> - - <!-- homeId duplique --> - <field-validator type="setLonglineUniqueHomeId" short-circuit="true"> - <message>validator.setLongline.duplicated.homeId##${duplicatedActivity}</message> - </field-validator> - - </field> - - <field name="number"> - - <!-- number duplique --> - <field-validator type="setLonglineUniqueNumber" short-circuit="true"> - <message>validator.setLongline.duplicated.number##${duplicatedActivity}</message> - </field-validator> - - </field> - - <field name="haulingDirectionSameAsSetting"> - - <!-- haulingDirectionSameAsSetting non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.haulingDirectionSameAsSetting</message> - </field-validator> - - </field> - - <field name="settingStartTimeStamp"> - - <!-- settingStartTimeStamp non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.settingStartTimeStamp</message> - </field-validator> - - </field> - - <field name="settingEndTimeStamp"> - - <!-- settingEndTimeStamp non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.settingEndTimeStamp</message> - </field-validator> - - <!-- settingStartTimeStamp < settingEndTimeStamp --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ settingStartTimeStamp == null || settingStartTimeStamp.time < settingEndTimeStamp.time ]]> - </param> - <message>validator.setLongline.settingStartTimeStamp.before.settingEndTimeStamp</message> - </field-validator> - - </field> - - <field name="settingVesselSpeed"> - - <!-- 0.0 <= settingVesselSpeed <= 30.0 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:30.0</param> - <param name="expression"><![CDATA[ - settingVesselSpeed == null || (doubles.min <= settingVesselSpeed && settingVesselSpeed <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.settingVesselSpeed##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="shooterSpeed"> - - <!-- 0.0 <= shooterSpeed <= 15.0 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:15.0</param> - <param name="expression"><![CDATA[ - shooterSpeed == null || (doubles.min <= shooterSpeed && shooterSpeed <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.shooterSpeed##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="swivelWeight"> - - <!-- 0.0 <= swivelWeight <= 0.2 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:0.2</param> - <param name="expression"><![CDATA[ - swivelWeight == null || (doubles.min <= swivelWeight && swivelWeight <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.swivelWeight##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="snapWeight"> - - <!-- 0.0 <= snapWeight <= 0.2 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:0.2</param> - <param name="expression"><![CDATA[ - snapWeight == null || (doubles.min <= snapWeight && snapWeight <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.snapWeight##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="maxDepthTargeted"> - - <!-- 0 <= maxDepthTargeted <= 1000 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="intParams">min:0|max:1000</param> - <param name="expression"><![CDATA[ - maxDepthTargeted == null || (ints.min <= maxDepthTargeted && maxDepthTargeted <= ints.max) - ]]> - </param> - <message> - validator.setLongline.bound.shooterSpeed##${ints.min}##${ints.max} - </message> - </field-validator> - - </field> - - <field name="timeBetweenHooks"> - - <!-- 0 <= timeBetweenHooks <= 60 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="longParams">min:0|max:60</param> - <param name="expression"><![CDATA[ - timeBetweenHooks == null || (longs.min <= timeBetweenHooks && timeBetweenHooks <= longs.max) - ]]> - </param> - <message> - validator.setLongline.bound.timeBetweenHooks##${longs.min}##${longs.max} - </message> - </field-validator> - - </field> - - <field name="haulingStartTimeStamp"> - - <!-- haulingStartTimeStamp non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.haulingStartTimeStamp</message> - </field-validator> - - <!-- settingEndTimeStamp < haulingStartTimeStamp --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ settingEndTimeStamp == null || settingEndTimeStamp.time < haulingStartTimeStamp.time ]]> - </param> - <message>validator.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp</message> - </field-validator> - - </field> - - <field name="haulingEndTimeStamp"> - - <!-- haulingEndTimeStamp non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.haulingEndTimeStamp</message> - </field-validator> - - <!-- haulingStartTimeStamp < haulingEndTimeStamp --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ haulingStartTimeStamp == null || haulingStartTimeStamp.time < haulingEndTimeStamp.time ]]> - </param> - <message>validator.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp</message> - </field-validator> - - </field> - - <field name="haulingBreaks"> - - <!-- haulingBreaks non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.haulingBreaks</message> - </field-validator> - - </field> - - <field name="settingStartQuadrant"> - - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.settingStartQuadrant</message> - </field-validator> - - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - tripLonglineEntity.ocean == null || settingStartQuadrant == null || settingStartQuadrant == 0 - || (tripLonglineEntity.ocean.code == 3) - || (tripLonglineEntity.ocean.code == 1 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2 || settingStartQuadrant == 3 || settingStartQuadrant == 4)) - || (tripLonglineEntity.ocean.code == 2 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2)) - ]]> - </param> - <message> - validator.setLongline.invalid.settingStartQuadrant##${tripLonglineEntity.ocean.libelle} - </message> - </field-validator> - - </field> - - <field name="settingEndQuadrant"> - - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.settingEndQuadrant</message> - </field-validator> - - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - tripLonglineEntity.ocean == null || settingEndQuadrant == null || settingEndQuadrant == 0 - || (tripLonglineEntity.ocean.code == 3) - || (tripLonglineEntity.ocean.code == 1 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2 || settingEndQuadrant == 3 || settingEndQuadrant == 4)) - || (tripLonglineEntity.ocean.code == 2 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2)) - ]]> - </param> - <message> - validator.setLongline.invalid.settingEndQuadrant##${tripLonglineEntity.ocean.libelle} - </message> - </field-validator> - - </field> - - - <field name="haulingStartQuadrant"> - - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.haulingStartQuadrant</message> - </field-validator> - - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - tripLonglineEntity.ocean == null || haulingStartQuadrant == null || haulingStartQuadrant == 0 - || (tripLonglineEntity.ocean.code == 3) - || (tripLonglineEntity.ocean.code == 1 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2 || haulingStartQuadrant == 3 || haulingStartQuadrant == 4)) - || (tripLonglineEntity.ocean.code == 2 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2)) - ]]> - </param> - <message> - validator.setLongline.invalid.haulingStartQuadrant##${tripLonglineEntity.ocean.libelle} - </message> - </field-validator> - - </field> - - <field name="haulingEndQuadrant"> - - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.haulingEndQuadrant</message> - </field-validator> - - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - tripLonglineEntity.ocean == null || haulingEndQuadrant == null || haulingEndQuadrant == 0 - || (tripLonglineEntity.ocean.code == 3) - || (tripLonglineEntity.ocean.code == 1 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2 || haulingEndQuadrant == 3 || haulingEndQuadrant == 4)) - || (tripLonglineEntity.ocean.code == 2 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2)) - ]]> - </param> - <message> - validator.setLongline.invalid.haulingEndQuadrant##${tripLonglineEntity.ocean.libelle} - </message> - </field-validator> - - </field> - - <field name="settingStartLatitude"> - - <!-- settingStartLatitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.settingStartLatitude</message> - </field-validator> - - <!-- 0 <= settingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:90.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(settingStartLatitude) && @java.lang.Math@abs(settingStartLatitude) <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.settingStartLatitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="settingStartLongitude"> - - <!-- settingStartLongitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.settingStartLongitude</message> - </field-validator> - - <!-- 0 <= settingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:180.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(settingStartLongitude) && @java.lang.Math@abs(settingStartLongitude) <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.settingStartLongitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="settingEndLatitude"> - - <!-- settingEndLatitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.settingEndLatitude</message> - </field-validator> - - <!-- 0 <= settingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:90.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(settingEndLatitude) && @java.lang.Math@abs(settingEndLatitude) <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.settingEndLatitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="settingEndLongitude"> - - <!-- settingEndLongitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.settingEndLongitude</message> - </field-validator> - - <!-- 0 <= settingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:180.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(settingEndLongitude) && @java.lang.Math@abs(settingEndLongitude) <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.settingEndLongitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="haulingStartLatitude"> - - <!-- haulingStartLatitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.haulingStartLatitude</message> - </field-validator> - - <!-- 0 <= haulingStartLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:90.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(haulingStartLatitude) && @java.lang.Math@abs(haulingStartLatitude) <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.haulingStartLatitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="haulingStartLongitude"> - - <!-- haulingStartLongitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.haulingStartLongitude</message> - </field-validator> - - <!-- 0 <= haulingStartLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:180.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(haulingStartLongitude) && @java.lang.Math@abs(haulingStartLongitude) <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.haulingStartLongitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - - <field name="haulingEndLatitude"> - - <!-- haulingEndLatitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.haulingEndLatitude</message> - </field-validator> - - <!-- 0 <= haulingEndLatitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:90.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(haulingEndLatitude) && @java.lang.Math@abs(haulingEndLatitude) <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.haulingEndLatitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="haulingEndLongitude"> - - <!-- haulingEndLongitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.haulingEndLongitude</message> - </field-validator> - - <!-- 0 <= haulingEndLongitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:180.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(haulingEndLongitude) && @java.lang.Math@abs(haulingEndLongitude) <= doubles.max) - ]]> - </param> - <message> - validator.setLongline.bound.haulingEndLongitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="settingShape"> - - <!-- settingShape desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ settingShape == null || settingShape.enabled ]]> - </param> - <message>validator.setLongline.desactivated.settingShape</message> - </field-validator> - - </field> - - <field name="lineType"> - - <!-- lineType desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ lineType == null || lineType.enabled ]]> - </param> - <message>validator.setLongline.desactivated.lineType</message> - </field-validator> - - </field> - - <field name="lightsticksType"> - - <!-- lightsticksType desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ lightsticksType == null || lightsticksType.enabled ]]> - </param> - <message>validator.setLongline.desactivated.lightsticksType</message> - </field-validator> - - </field> - - <field name="lightsticksColor"> - - <!-- lightsticksColor desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ lightsticksColor == null || lightsticksColor.enabled ]]> - </param> - <message>validator.setLongline.desactivated.lightsticksColor</message> - </field-validator> - - </field> - - <field name="totalSectionsCount"> - - <!-- totalSectionsCount obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.totalSectionsCount</message> - </field-validator> - - <!-- 0 <= totalSectionsCount <= 100 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="intParams">min:0|max:100</param> - <param name="expression"><![CDATA[ - totalSectionsCount == null || (ints.min <= totalSectionsCount && totalSectionsCount <= ints.max) - ]]> - </param> - <message> - validator.setLongline.bound.totalSectionsCount##${ints.min}##${ints.max} - </message> - </field-validator> - - </field> - - <field name="basketsPerSectionCount"> - - <!-- basketsPerSectionCount obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.basketsPerSectionCount</message> - </field-validator> - - <!-- 0 <= basketsPerSectionCount <= 100 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="intParams">min:0|max:100</param> - <param name="expression"><![CDATA[ - (ints.min <= basketsPerSectionCount && basketsPerSectionCount <= ints.max) - ]]> - </param> - <message> - validator.setLongline.bound.basketsPerSectionCount##${ints.min}##${ints.max} - </message> - </field-validator> - - </field> - - <field name="branchlinesPerBasketCount"> - - <!-- branchlinesPerBasketCount obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.required.branchlinesPerBasketCount</message> - </field-validator> - - <!-- 0 <= branchlinesPerBasketCount <= 50 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="intParams">min:0|max:50</param> - <param name="expression"><![CDATA[ - (ints.min <= branchlinesPerBasketCount && branchlinesPerBasketCount <= ints.max) - ]]> - </param> - <message> - validator.setLongline.bound.branchlinesPerBasketCount##${ints.min}##${ints.max} - </message> - </field-validator> - - </field> - - <field name="totalBasketsCount"> - - <!-- 0 <= totalBasketsCount <= 1000 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="intParams">min:0|max:1000</param> - <param name="expression"><![CDATA[ - totalBasketsCount == null || (ints.min <= totalBasketsCount && totalBasketsCount <= ints.max) - ]]> - </param> - <message> - validator.setLongline.bound.totalBasketsCount##${ints.min}##${ints.max} - </message> - </field-validator> - - </field> - - <field name="totalHooksCount"> - - <!-- 0 <= totalHooksCount <= 5000 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="intParams">min:0|max:5000</param> - <param name="expression"><![CDATA[ - totalHooksCount == null || (ints.min <= totalHooksCount && totalHooksCount <= ints.max) - ]]> - </param> - <message> - validator.setLongline.bound.totalHooksCount##${ints.min}##${ints.max} - </message> - </field-validator> - - </field> - - <field name="lightsticksPerBasketCount"> - - <!-- 0 <= lightsticksPerBasketCount <= 50 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="intParams">min:0|max:50</param> - <param name="expression"><![CDATA[ - lightsticksPerBasketCount == null || (ints.min <= lightsticksPerBasketCount && lightsticksPerBasketCount <= ints.max) - ]]> - </param> - <message> - validator.setLongline.bound.lightsticksPerBasketCount##${ints.min}##${ints.max} - </message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-warning-validation.xml deleted file mode 100644 index f7c51a3..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-warning-validation.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="homeId"> - - <!-- homeId non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.setLongline.null.homeId</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-error-validation.xml deleted file mode 100644 index f61e891..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-error-validation.xml +++ /dev/null @@ -1,249 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="tripType"> - - <!-- pas de tripType selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.tripType</message> - </field-validator> - - <!-- tripType desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ tripType.enabled ]]> - </param> - <message>validator.trip.desactivated.tripType</message> - </field-validator> - - </field> - - <field name="observer"> - - <!-- pas de observer selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.observer</message> - </field-validator> - - <!-- observer desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ observer.enabled ]]> - </param> - <message>validator.trip.desactivated.observer</message> - </field-validator> - - </field> - - <field name="captain"> - - <!-- captain desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ captain == null || captain.enabled ]]> - </param> - <message>validator.trip.desactivated.captain</message> - </field-validator> - - </field> - - <field name="dataEntryOperator"> - - <!-- dataEntryOperator desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ dataEntryOperator == null || dataEntryOperator.enabled ]]> - </param> - <message>validator.trip.desactivated.dataEntryOperator</message> - </field-validator> - - </field> - - <field name="vessel"> - - <!-- pas de vessel sélectionné --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.vessel</message> - </field-validator> - - <!-- vessel desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ vessel.enabled ]]> - </param> - <message>validator.trip.desactivated.vessel</message> - </field-validator> - - </field> - - <field name="ocean"> - - <!-- pas d'ocean selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.ocean</message> - </field-validator> - - <!-- ocean desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ ocean.enabled ]]> - </param> - <message>validator.trip.desactivated.ocean</message> - </field-validator> - - </field> - - <field name="departureHarbour"> - - <!-- pas de departureHarbour selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.departureHarbour</message> - </field-validator> - - <!-- departureHarbour desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ departureHarbour.enabled ]]> - </param> - <message>validator.trip.desactivated.departureHarbour</message> - </field-validator> - - </field> - - <field name="landingHarbour"> - - <!-- landingHarbour desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ landingHarbour == null || landingHarbour.enabled ]]> - </param> - <message>validator.trip.desactivated.landingHarbour</message> - </field-validator> - - </field> - - <field name="startDate"> - - <!-- pas de date de debut selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.startDate</message> - </field-validator> - - </field> - - <field name="endDate"> - - <!-- pas de date de fin selectionnee --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.endDate</message> - </field-validator> - - <!-- date de fin avant date de debut --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ endDate == null || endDate.time >= startDate.time ]]> - </param> - <message>validator.trip.endDate.after.startDate</message> - </field-validator> - - </field> - - <field name="comment"> - - <!-- comentaire de moins de 1024 caractères --> - <field-validator type="stringlength"> - <param name="maxLength">1024</param> - <message>validator.trip.comment.tobig</message> - </field-validator> - - <!-- comment requis selon le type de tripType choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ tripType == null || !tripType.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.tripType</message> - </field-validator> - - <!-- comment requis selon le type de departureHarbour choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ departureHarbour == null || !departureHarbour.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.departureHarbour</message> - </field-validator> - - <!-- comment requis selon le type de landingHarbour choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ landingHarbour == null || !landingHarbour.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.landingHarbour</message> - </field-validator> - - <!-- comment requis selon le type de vessel choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ vessel == null || !vessel.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.vessel</message> - </field-validator> - - <!-- comment requis selon le type de ocean choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ ocean == null || !ocean.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.ocean</message> - </field-validator> - - <!-- comment requis selon le type de dataEntryOperator choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ dataEntryOperator == null || !dataEntryOperator.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.dataEntryOperator</message> - </field-validator> - - <!-- comment requis selon le type de observer choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ observer == null || !observer.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.observer</message> - </field-validator> - - <!-- comment requis selon le type de captain choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ captain == null || !captain.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.captain</message> - </field-validator> - - </field> -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-warning-validation.xml deleted file mode 100644 index a39dbb4..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-warning-validation.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="landingHarbour"> - - <!-- pas de landingHarbour selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.null.landingHarbour</message> - </field-validator> - - </field> - - <field name="captain"> - - <!-- pas de captain selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.null.captain</message> - </field-validator> - - </field> - - <field name="dataEntryOperator"> - - <!-- pas de dataEntryOperator selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.null.dataEntryOperator</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml deleted file mode 100644 index 6aad3b1..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="iso2Code"> - <!-- pas de iso2Code renseigne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.country.required.iso2Code</message> - </field-validator> - - <!-- clef unique sur le iso2Code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">iso2Code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.country.invalid.iso2Code.uniqueKey##${codeIso2}</message> - </field-validator> - - </field> - - <field name="iso3Code"> - <!-- pas de iso3Code renseigne --> - <field-validator type="requiredstring"> - <message>validator.country.required.iso3Code</message> - </field-validator> - - <!-- clef unique sur le iso3Code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">iso3Code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.country.invalid.iso3Code.uniqueKey##${codeIso3}</message> - </field-validator> - - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml deleted file mode 100644 index b323f8c..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-warning-validation.xml deleted file mode 100644 index 9544187..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-warning-validation.xml +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - - <field name="startDate"> - <!-- pas de startDate renseigne --> - <field-validator type="required"> - <message>validator.lengthWeightParameter.required.startDate - </message> - </field-validator> - </field> - - <field name="endDate"> - <!-- pas de endDate renseigne --> - <field-validator type="required"> - <message>validator.lengthWeightParameter.required.endDate - </message> - </field-validator> - </field> -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml deleted file mode 100644 index 39b9df0..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntityEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml deleted file mode 100644 index fddb53e..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml deleted file mode 100644 index cdd92c8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="gearCaracteristicType"> - - <!-- pas de gearCaracteristicType renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.gearCaracteristic.required.gearCaracteristicType</message> - </field-validator> - - <!-- gearCaracteristicType desactivee --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ disabled || gearCaracteristicType.enabled ]]> - </param> - <message>validator.gearCaracteristic.desactivated.gearCaracteristicType</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml deleted file mode 100644 index fddb53e..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml deleted file mode 100644 index 9ac1e38..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml deleted file mode 100644 index fddb53e..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml deleted file mode 100644 index b9958a9..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="country"> - <!-- pas de country renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.organism.required.country</message> - </field-validator> - - <!-- country desactivee --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ disabled || country.enabled ]]> - </param> - <message>validator.organism.desactivated.country</message> - </field-validator> - </field> - - <field name="name"> - <!-- pas de name renseigne --> - <field-validator type="requiredstring"> - <message>validator.harbour.required.name</message> - </field-validator> - </field> - - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-warning-validation.xml deleted file mode 100644 index f7ebe25..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="locode"> - <!-- pas de description renseignee --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.harbour.null.locode</message> - </field-validator> - </field> - - <field name="latitude"> - <!-- pas de latitude renseignee --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.harbour.null.latitude</message> - </field-validator> - </field> - - <field name="longitude"> - <!-- pas de longitude renseignee --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.harbour.null.longitude</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml deleted file mode 100644 index f6311ae..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="species"> - <!-- pas de species selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.lengthWeightParameter.required.species</message> - </field-validator> - - <!-- clef unique species - gender - ocean - startDate --> - <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">species,sex,ocean,startDate</param> - <!--<param name="againstMe">true</param>--> - <message>validator.lengthWeightParameter.invalid.uniqueKey</message> - </field-validator> - </field> - - <field name="ocean"> - <!-- clef unique species - gender - ocean - startDate --> - <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">species,sex,ocean,startDate</param> - <!--<param name="againstMe">true</param>--> - <message>validator.lengthWeightParameter.invalid.uniqueKey</message> - </field-validator> - </field> - - <field name="sex"> - <!-- clef unique species - gender - ocean - startDate --> - <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">species,sex,ocean,startDate</param> - <!--<param name="againstMe">true</param>--> - <message>validator.lengthWeightParameter.invalid.uniqueKey</message> - </field-validator> - </field> - - <field name="startDate"> - <!-- clef unique species - gender - ocean - startDate --> - <field-validator type="observeCollectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">species,sex,ocean,startDate</param> - <!--<param name="againstMe">true</param>--> - <message>validator.lengthWeightParameter.invalid.uniqueKey</message> - </field-validator> - </field> - - <field name="lengthWeightFormula"> - <!-- pas de relation weight renseignee --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.lengthWeightParameter.required.lengthWeightFormula - </message> - </field-validator> - - <!-- relation weight invalide --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ lengthWeightFormulaValid ]]> - </param> - <message>validator.lengthWeightParameter.invalid.lengthWeightFormula - </message> - </field-validator> - - </field> - - <field name="weightLengthFormula"> - <!-- pas de relation taille renseignee --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.lengthWeightParameter.required.weightLengthFormula - </message> - </field-validator> - - <!-- relation taille invalide --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ weightLengthFormulaValid ]]> - </param> - <message>validator.lengthWeightParameter.invalid.weightLengthFormula - </message> - </field-validator> - - </field> - - <field name="coefficients"> - <!-- pas de coefficients renseigne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.lengthWeightParameter.required.coefficients - </message> - </field-validator> - - <!-- syntaxe coefficients invalide FIXME chemit 2010_08-21 Il faut autoriser les ecritures scientifique E[+-][0-9]+--> - <!--field-validator type="regex"> - <param name="expression">\w+=[0-9]+(\.[0-9]+(E[+-]*[0-9]+)*)*(:\w+=[0-9]+(\.[0-9]+(E[+-]*[0-9]+)*)*)*</param> - <message>validator.lengthWeightParameter.invalid.coefficients</message> - </field-validator--> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-warning-validation.xml deleted file mode 100644 index 1135ba0..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-warning-validation.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="ocean"> - <!-- pas de ocean renseigne --> - <field-validator type="required"> - <message>validator.lengthWeightParameter.null.ocean</message> - </field-validator> - </field> - - <field name="startDate"> - <!-- pas de startDate renseigne --> - <field-validator type="required"> - <message>validator.lengthWeightParameter.required.startDate - </message> - </field-validator> - </field> - - <field name="endDate"> - <!-- pas de endDate renseigne --> - <field-validator type="required"> - <message>validator.lengthWeightParameter.required.endDate - </message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml deleted file mode 100644 index 01a4ba4..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="country"> - <!-- pas de country renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.organism.required.country</message> - </field-validator> - - <!-- country desactivee --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ disabled || country.enabled ]]> - </param> - <message>validator.organism.desactivated.country</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-warning-validation.xml deleted file mode 100644 index 87bc45b..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-warning-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="description"> - <!-- pas de description selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.organism.null.description</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml deleted file mode 100644 index fdb057d..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri--> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="lastName"> - <!-- pas de lastName renseigne --> - <field-validator type="requiredstring"> - <message>validator.person.required.lastName</message> - </field-validator> - </field> - - <field name="firstName"> - <!-- pas de firstName renseigne --> - <field-validator type="requiredstring"> - <message>validator.person.required.firstName</message> - </field-validator> - </field> - - <field name="country"> - <!-- pas de country renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.person.required.country</message> - </field-validator> - - <!-- country desactivee --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ disabled || country.enabled ]]> - </param> - <message>validator.person.desactivated.country</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-warning-validation.xml deleted file mode 100644 index ea7caa4..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-warning-validation.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml deleted file mode 100644 index 6726c03..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="organism"> - <!-- pas de organism renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.program.required.organism</message> - </field-validator> - - <!-- organism desactivee --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ disabled || organism.enabled ]]> - </param> - <message>validator.program.desactivated.organism</message> - </field-validator> - </field> - - <field name="gearType"> - <!-- pas de type d'engin renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.program.required.gearType</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-warning-validation.xml deleted file mode 100644 index 600fe7c..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-warning-validation.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="startDate"> - <!-- pas de startDate renseigne --> - <field-validator type="required"> - <message>validator.program.required.startDate</message> - </field-validator> - </field> - - <field name="endDate"> - <!-- pas de endDate renseigne --> - <field-validator type="required"> - <message>validator.program.required.endDate</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - - <field name="comment"> - - <!-- comentaire de moins de 1024 caractères --> - <field-validator type="stringlength"> - <param name="maxLength">1024</param> - <message>validator.program.comment.tobig</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml deleted file mode 100644 index b323f8c..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-warning-validation.xml deleted file mode 100644 index 5edf71b..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-warning-validation.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml deleted file mode 100644 index e981a11..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml +++ /dev/null @@ -1,138 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="homeId"> - <!-- clef unique sur le homeId --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">homeId</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.species.invalid.homeId.uniqueKey##${homeId}</message> - </field-validator> - </field> - - <field name="faoCode"> - <!-- clef unique sur le faoCode --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">faoCode</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.species.invalid.faoCode.uniqueKey##${faoCode}</message> - </field-validator> - </field> - - <field name="wormsId"> - <!-- clef unique sur le wormsId --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">wormsId</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.species.invalid.wormsId.uniqueKey##${wormsId}</message> - </field-validator> - </field> - - <field name="speciesGroup"> - <!-- pas de speciesGroup renseigne --> - <!--field-validator type="required" short-circuit="true"> - <message>validator.species.required.speciesGroup</message> - </field-validator--> - - <!-- speciesGroup desactivee --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ disabled || speciesGroup.enabled ]]> - </param> - <message>validator.species.desactivated.speciesGroup</message> - </field-validator> - </field> - - <field name="scientificLabel"> - - <!-- pas de scientificLabel renseigne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.species.required.scientificLabel</message> - </field-validator> - - <!-- clef unique sur le scientificLabel --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">scientificLabel</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.species.invalid.scientificLabel.uniqueKey##${scientificLabel}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-warning-validation.xml deleted file mode 100644 index fd865c6..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-warning-validation.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="homeId"> - <!-- pas de homeId renseigne --> - <field-validator type="requiredstring"> - <message>validator.species.null.homeId</message> - </field-validator> - </field> - - <field name="faoCode"> - <!-- pas de faoCode renseigne --> - <field-validator type="requiredstring"> - <message>validator.species.null.faoCode</message> - </field-validator> - </field> - - <field name="wormsId"> - <!-- wormsId > 0 --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ wormsId > 0 ]]> - </param> - <message>validator.species.invalid.wormsId##${wormsId}</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-warning-validation.xml deleted file mode 100644 index e981384..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-warning-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="code"> - <!-- pas de code renseigne --> - <field-validator type="requiredstring"> - <message>validator.speciesList.null.code</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml deleted file mode 100644 index a108075..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml +++ /dev/null @@ -1,134 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="keelCode"> - <!-- keelCode > 0 --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ keelCode > 0 ]]> - </param> - <message>validator.vessel.invalid.keelCode##${codeQuille}</message> - </field-validator> - </field> - - <field name="fleetCountry"> - <!-- fleetCountry > 0 --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ fleetCountry > 0 ]]> - </param> - <message>validator.vessel.invalid.fleetCountry##${codeFlotte}</message> - </field-validator> - </field> - - <field name="vesselType"> - <!-- pas de vesselType renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.vessel.required.vesselType</message> - </field-validator> - - <!-- vesselType desactive --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ disabled || vesselType.enabled ]]> - </param> - <message>validator.vessel.desactivated.vesselType</message> - </field-validator> - </field> - - <field name="vesselSizeCategory"> - <!-- pas de vesselSizeCategory renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.vessel.required.vesselSizeCategory</message> - </field-validator> - - <!-- vesselSizeCategory desactive --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ disabled || vesselSizeCategory.enabled ]]> - </param> - <message>validator.vessel.desactivated.vesselSizeCategory</message> - </field-validator> - </field> - - <field name="flagCountry"> - <!-- pas de flagCountry renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.vessel.required.flagCountry</message> - </field-validator> - - <!-- flagCountry desactive --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ disabled || flagCountry.enabled ]]> - </param> - <message>validator.vessel.desactivated.flagCountry</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-warning-validation.xml deleted file mode 100644 index 17498ff..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-warning-validation.xml +++ /dev/null @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="changeDate"> - <!-- pas de changeDate selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.vessel.null.changeDate</message> - </field-validator> - </field> - - <field name="length"> - <!-- length > 0 --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ length > 0 ]]> - </param> - <message> - validator.vessel.invalid.length##${lengthHorsToute} - </message> - </field-validator> - </field> - - <field name="capacity"> - <!-- capacity > 0 --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ capacity > 0 ]]> - </param> - <message> - validator.vessel.invalid.capacity##${capaciteTransport} - </message> - </field-validator> - </field> - - <field name="power"> - <!-- power > 0 --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ power > 0 ]]> - </param> - <message> - validator.vessel.invalid.power##${puissanceGroupePrincipal} - </message> - </field-validator> - </field> - - <field name="yearService"> - <!-- yearService > 0 --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ yearService > 0 ]]> - </param> - <message>validator.vessel.invalid.yearService##${anneeService}</message> - </field-validator> - </field> - - <field name="searchMaximum"> - <!-- searchMaximum > 0 --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ searchMaximum > 0 ]]> - </param> - <message> - validator.vessel.invalid.searchMaximum##${vitesseMaximaleProcespection} - </message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml deleted file mode 100644 index 827ebd4..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="gaugeLabel"> - <!-- pas de gaugeLabel renseigne --> - <field-validator type="requiredstring"> - <message>validator.vesselSizeCategory.required.gaugeLabel</message> - </field-validator> - </field> - - <field name="capacityLabel"> - <!-- pas de capacityLabel renseigne --> - <field-validator type="requiredstring"> - <message>validator.vesselSizeCategory.required.capacityLabel</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-warning-validation.xml deleted file mode 100644 index ea7caa4..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-warning-validation.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml deleted file mode 100644 index 1869733..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="brandName"> - <!-- pas de brandName renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.brandName</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-warning-validation.xml deleted file mode 100644 index bf2770f..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-warning-validation.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml deleted file mode 100644 index 1967477..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-warning-validation.xml deleted file mode 100644 index 52b9227..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-warning-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml deleted file mode 100644 index 2a90a31..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml deleted file mode 100644 index 043a266..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri} - </message> - </field-validator> - </field> - - <field name="species"> - <!-- pas de species selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.weightCategory.required.species</message> - </field-validator> - - <!-- species desactivee --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ disabled || species.enabled ]]> - </param> - <message>validator.weightCategory.desactivated.species</message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml deleted file mode 100644 index a44070e..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="code"> - - <!-- clef unique sur le code --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">code</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> - </field-validator> - - </field> - - <field name="uri"> - <!-- clef unique sur l'uri --> - <field-validator type="collectionUniqueKey" short-circuit="true"> - <param name="collectionFieldName">editingReferentielListEntity</param> - <param name="keys">uri</param> - <param name="againstMe">true</param> - <param name="nullValueSkipped">true</param> - <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> - </field-validator> - </field> - - <field name="speedRange"> - <!-- pas de speedRange renseigne --> - <field-validator type="requiredstring"> - <message>validator.wind.required.speedRange</message> - </field-validator> - </field> - - <field name="waveHeight"> - <!-- pas de waveHeight renseigne --> - <field-validator type="requiredstring"> - <message>validator.wind.required.waveHeight - </message> - </field-validator> - </field> - - <field name="label1"> - <!-- pas de libelle 1 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label1</message> - </field-validator> - </field> - - <field name="label2"> - <!-- pas de libelle 2 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label2</message> - </field-validator> - </field> - - <field name="label3"> - <!-- pas de libelle 3 renseigne --> - <field-validator type="requiredstring"> - <message>validator.referentiel.required.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-warning-validation.xml deleted file mode 100644 index 13a5be8..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-warning-validation.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="status"> - <!-- objet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ enabled ]]> - </param> - <message>validator.referentiel.status.desactivated</message> - </field-validator> - </field> - - <field name="uri"> - <!-- pas d'uri selectionne --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.referentiel.null.uri</message> - </field-validator> - </field> - - <field name="label1"> - - <!-- libelle 1 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label1</message> - </field-validator> - </field> - - <field name="label3"> - <!-- libelle 3 non traduit (egal a label2) --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> - </param> - <message>validator.referentiel.untranslated.label3</message> - </field-validator> - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml deleted file mode 100644 index f62c9e9..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml +++ /dev/null @@ -1,343 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="vesselActivitySeine"> - - <!-- pas de vesselActivitySeine selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.vesselActivity</message> - </field-validator> - - <!-- vesselActivitySeine desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ vesselActivitySeine.enabled ]]> - </param> - <message>validator.activity.desactivated.vesselActivity</message> - </field-validator> - - <!-- activity de fin de veille possible --> - <field-validator type="activityFinDeVeilleExists" short-circuit="true"> - <param name="required">false</param> - <message>validator.route.activityFinDeVeille.notAvailable</message> - </field-validator> - - <!-- activity de debut de pêche possible --> - <!--field-validator type="activityDebutDePecheSane"> - <message>validator.route.activityDebutDePeche.notAvailable</message> - </field-validator--> - - <!-- activity de fin de pêche possible --> - <!--field-validator type="activityFinDePecheSane"> - <message>validator.route.activityFinDePeche.notAvailable</message> - </field-validator--> - - </field> - - <field name="surroundingActivity"> - - <!-- surroundingActivity desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ surroundingActivity == null || surroundingActivity.enabled ]]> - </param> - <message>validator.activity.desactivated.surroundingActivity</message> - </field-validator> - - </field> - - <field name="reasonForNoFishing"> - - <!-- reasonForNoFishing desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ reasonForNoFishing == null || reasonForNoFishing.enabled ]]> - </param> - <message>validator.activity.desactivated.reasonForNoFishing</message> - </field-validator> - - </field> - - <field name="detectionMode"> - - <!-- detectionMode desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ detectionMode == null || detectionMode.enabled ]]> - </param> - <message>validator.activity.desactivated.detectionMode</message> - </field-validator> - - </field> - - <field name="wind"> - - <!-- wind desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ wind == null || wind.enabled ]]> - </param> - <message>validator.activity.desactivated.wind</message> - </field-validator> - - </field> - - <field name="previousFpaZone"> - - <!-- previousFpaZone desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ previousFpaZone == null || previousFpaZone.enabled ]]> - </param> - <message>validator.activity.desactivated.previousFpaZone</message> - </field-validator> - - </field> - - - <field name="currentFpaZone"> - - <!-- currentFpaZone desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ currentFpaZone == null || currentFpaZone.enabled ]]> - </param> - <message>validator.activity.desactivated.currentFpaZone</message> - </field-validator> - - </field> - - <field name="nextFpaZone"> - - <!-- nextFpaZone desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ nextFpaZone == null || nextFpaZone.enabled ]]> - </param> - <message>validator.activity.desactivated.nextFpaZone</message> - </field-validator> - - </field> - - <field name="time"> - - <!-- pas d'heure d'observation selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.time</message> - </field-validator> - - <!-- heure observation non duplique --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ - routeEntity.isTimeAvailable(topiaId, time) - ]]> - </param> - <message>validator.activity.duplicated.time</message> - </field-validator> - - </field> - - <field name="quadrant"> - - <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.quadrant</message> - </field-validator> - - <!-- coherence quadrant par rapport a l'ocean de la maree --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - tripSeineEntity.ocean == null || quadrant == null || quadrant == 0 - || (tripSeineEntity.ocean.code == 3) - || (tripSeineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (tripSeineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) - ]]> - </param> - <message> - validator.activity.invalid.quadrant##${tripSeineEntity.ocean.libelle} - </message> - </field-validator> - - </field> - - <field name="latitude"> - - <!-- latitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.latitude</message> - </field-validator> - - <!-- 0 <= latitude <= 90 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:90.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(latitude) && @java.lang.Math@abs(latitude) <= doubles.max) - ]]> - </param> - <message> - validator.activity.bound.latitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="longitude"> - - <!-- longitude obligatoire --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.required.longitude</message> - </field-validator> - - <!-- 0 <= longitude <= 180 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:0.0|max:180.0</param> - <param name="expression"><![CDATA[ - (doubles.min <= @java.lang.Math@abs(longitude) && @java.lang.Math@abs(longitude) <= doubles.max) - ]]> - </param> - <message> - validator.activity.bound.longitude##${doubles.min}##${doubles.max} - </message> - </field-validator> - - </field> - - <field name="vesselSpeed"> - - <!-- 0 <= vesselSpeed <= 35 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">0</param> - <param name="maxInclusive">35</param> - <message> - validator.activity.bound.vesselSpeed##${minInclusive}##${maxInclusive} - </message> - </field-validator> - - </field> - - <field name="seaSurfaceTemperature"> - - <!-- temperature surface non saisie || 12.0 <= temperature surface <= 35.0 --> - <field-validator type="fieldexpressionwithparams" short-circuit="true"> - <param name="doubleParams">min:12.0|max:35.0</param> - <param name="expression"> - <![CDATA[ seaSurfaceTemperature == null || (doubles.min <= seaSurfaceTemperature && seaSurfaceTemperature <= doubles.max)]]> - </param> - <message> - validator.activity.bound.seaSurfaceTemperature##${doubles.min}##${doubles.max} - </message> - </field-validator> - - <!-- coherence temperature surface (delta de 12° par rapport a celle de l'activity precedente) --> - <field-validator type="fieldexpression"> - <param name="expression"><![CDATA[ - seaSurfaceTemperature == null || previousActivity == null || previousActivity.seaSurfaceTemperature == null || - (previousActivity.seaSurfaceTemperature > seaSurfaceTemperature ? - previousActivity.seaSurfaceTemperature - seaSurfaceTemperature <= 12.0 - : seaSurfaceTemperature - previousActivity.seaSurfaceTemperature <= 12.0 - ) - ]]> - </param> - <message> - validator.activity.invalid.seaSurfaceTemperature##${seaSurfaceTemperature}##${previousActivity.seaSurfaceTemperature}##${previousActivity.time} - </message> - </field-validator> - - </field> - - <field name="comment"> - <!-- comentaire de moins de 1024 caractères --> - <field-validator type="stringlength"> - <param name="maxLength">1024</param> - <message>validator.activity.comment.tobig</message> - </field-validator> - - <!-- comentaire requis pour le type d'activity vessel selectionne --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ vesselActivitySeine == null || !vesselActivitySeine.needComment || (comment != null && !comment.empty) ]]> - </param> - <message> - validator.activity.required.comment.for.vesselActivity - </message> - </field-validator> - - <!-- comentaire requis pour le type de mode de dectection selectionne --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ detectionMode == null || !detectionMode.needComment || (comment != null && !comment.empty) ]]> - </param> - <message> - validator.activity.required.comment.for.detectionMode - </message> - </field-validator> - - <!-- comentaire requis pour le type de cause non coup de senne selectionne --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ reasonForNoFishing == null || !reasonForNoFishing.needComment || (comment != null && !comment.empty) ]]> - </param> - <message> - validator.activity.required.comment.for.reasonForNoFishing - </message> - </field-validator> - - <!-- comentaire requis pour previousFpaZone --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ previousFpaZone == null || !previousFpaZone.needComment || (comment != null && !comment.empty) ]]> - </param> - <message> - validator.activity.required.comment.for.previousFpaZone - </message> - </field-validator> - - <!-- comentaire requis pour currentFpaZone --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ currentFpaZone == null || !currentFpaZone.needComment || (comment != null && !comment.empty) ]]> - </param> - <message> - validator.activity.required.comment.for.currentFpaZone - </message> - </field-validator> - - <!-- comentaire requis pour nextFpaZone --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ nextFpaZone == null || !nextFpaZone.needComment || (comment != null && !comment.empty) ]]> - </param> - <message> - validator.activity.required.comment.for.nextFpaZone - </message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-warning-validation.xml deleted file mode 100644 index e7e429f..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-warning-validation.xml +++ /dev/null @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="time"> - - <field-validator type="activitySimpleSpeed" short-circuit="true"> - <param name="speed">30.0</param> - <message>validator.activity.invalid.speed##${foundSpeed}##${speed}</message> - </field-validator> - - </field> - - <field name="surroundingActivity"> - - <!-- Aucune activity environnante selectionnee --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.null.surroundingActivity</message> - </field-validator> - - </field> - - <field name="wind"> - - <!-- Aucun vent beaufort selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.null.wind</message> - </field-validator> - - </field> - - <field name="quadrant"> - - <!-- pas de quadrant selectionne --> - <field-validator type="int" short-circuit="true"> - <param name="min">1</param> - <message>validator.activity.required.quadrant</message> - </field-validator> - - <field-validator type="activitySimpleSpeed" short-circuit="true"> - <param name="speed">30.0</param> - <message>validator.activity.invalid.speed##${foundSpeed}##${speed}</message> - </field-validator> - - </field> - - <field name="seaSurfaceTemperature"> - - <!-- temperature surface non saisie --> - <field-validator type="required" short-circuit="true"> - <message>validator.activity.null.seaSurfaceTemperature</message> - </field-validator> - - </field> - - <field name="latitude"> - - <field-validator type="activitySimpleSpeed" short-circuit="true"> - <param name="speed">30.0</param> - <message>validator.activity.invalid.speed##${foundSpeed}##${speed}</message> - </field-validator> - - </field> - - <field name="longitude"> - - <field-validator type="activitySimpleSpeed" short-circuit="true"> - <param name="speed">30.0</param> - <message>validator.activity.invalid.speed##${foundSpeed}##${speed}</message> - </field-validator> - - </field> - - <field name="vesselSpeed"> - - <!-- 0 <= vesselSpeed <= 35 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">0</param> - <param name="maxInclusive">35</param> - <message> - validator.activity.bound.vesselSpeed##${minInclusive}##${maxInclusive} - </message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml deleted file mode 100644 index fe5b689..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml +++ /dev/null @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="objectType"> - - <!-- pas de type selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.floatingObject.required.type</message> - </field-validator> - - <!-- type desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ objectType.enabled ]]> - </param> - <message>validator.floatingObject.desactivated.type</message> - </field-validator> - - </field> - - <field name="objectOperation"> - - <!-- pas de objectOperation selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.floatingObject.required.objectOperation</message> - </field-validator> - - <!-- objectOperation desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ objectOperation.enabled ]]> - </param> - <message>validator.floatingObject.desactivated.objectOperation</message> - </field-validator> - - </field> - - <field name="supportVesselName"> - - <!-- supportVesselName de ${maxLength} caractères maximum --> - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">maxLength:32</param> - <param name="expression"> - <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> - </param> - <message>validator.floatingObject.size.supportVesselName##${ints.maxLength}</message> - </field-validator> - - </field> - - <field name="daysAtSeaCount"> - - <!-- count de jours a la mer positif --> - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <message>validator.floatingObject.positive.daysAtSeaCount</message> - </field-validator> - - </field> - - <field name="comment"> - - <!-- comentaire de moins de 1024 caractères --> - <field-validator type="stringlength"> - <param name="maxLength">1024</param> - <message>validator.floatingObject.comment.tobig</message> - </field-validator> - - <!-- comment requis pour certains types d'objet --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ objectType == null || !objectType.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.floatingObject.required.comment.for.type</message> - </field-validator> - - <!-- comment requis pour certains objectFates d'objet --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ objectFate == null || !objectFate.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.floatingObject.required.comment.for.objectFate</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-warning-validation.xml deleted file mode 100644 index e89bff3..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-warning-validation.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="objectFate"> - - <!-- pas de objectFate selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.floatingObject.required.objectFate</message> - </field-validator> - - <!-- objectFate desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ objectFate.enabled ]]> - </param> - <message>validator.floatingObject.desactivated.objectFate</message> - </field-validator> - - </field> - - <field name="daysAtSeaCount"> - - <!-- count de jour a l'eau non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.floatingObject.null.daysAtSeaCount</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml deleted file mode 100644 index 660f43f..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="date"> - - <!-- pas de jour d'observation --> - <field-validator type="required" short-circuit="true"> - <message>validator.route.required.date</message> - </field-validator> - - <!-- coherence jour observation < trip.startDate --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - tripSeineEntity.startDate.time <= date.time - ]]> - </param> - <message>validator.route.invalid.date##${tripSeineEntity.startDate}</message> - </field-validator> - - <!-- jour observation non duplique --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - tripSeineEntity.isDateAvailable(topiaId, date) - ]]> - </param> - <message>validator.route.duplicated.date</message> - </field-validator> - </field> - - <field name="comment"> - - <!-- comentaire de moins de 1024 caractères --> - <field-validator type="stringlength"> - <param name="maxLength">1024</param> - <message>validator.route.comment.tobig</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml deleted file mode 100644 index 171e1cc..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="startLogValue"> - - <!-- loch matin >= 0 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">0</param> - <message>validator.route.positive.startLogValue</message> - </field-validator> - - <!-- coherence loch matin ( superieur a tout loch soir d'une route plus ancienne) --> - <field-validator type="collectionFieldExpression"> - <param name="mode">ALL</param> - <param name="useSensitiveContext">true</param> - <param name="collectionFieldName">tripSeineEntity.route</param> - <!--param name="expressionForFirst"><![CDATA[ current.startLogValue == null || current.startLogValue == 0 ]]></param--> - <param name="expression"> - <![CDATA[ startLogValue == null || current.endLogValue == null || current.date.time > date.time || current.endLogValue <= startLogValue ]]> - </param> - <message>validator.route.invalid.startLogValue##${startLogValue}##${current.endLogValue}##${current.date}</message> - </field-validator> - - </field> - - <field name="comment"> - - <!-- pas de comment saisie --> - <field-validator type="requiredstring" short-circuit="true"> - <message>validator.route.null.comment</message> - </field-validator> - - </field> -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml deleted file mode 100644 index bc0303b..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml +++ /dev/null @@ -1,198 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="reasonForNullSet"> - - <!-- reasonForNullSet desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ reasonForNullSet == null || reasonForNullSet.enabled ]]> - </param> - <message>validator.set.desactivated.reasonForNullSet</message> - </field-validator> - - </field> - - <field name="maxGearDepth"> - - <!-- maxGearDepth entre 0 et 1100 --> - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <param name="max">1100</param> - <message>validator.set.bound.maxGearDepth##${min}##${max}</message> - </field-validator> - - </field> - - <field name="schoolThickness"> - - <!-- 1 <= schoolThickness <= 500 --> - <field-validator type="int" short-circuit="true"> - <param name="min">1</param> - <param name="max">500</param> - <message>validator.set.bound.schoolThickness##${min}##${max}</message> - </field-validator> - - </field> - - <field name="schoolMeanDepth"> - - <!-- 0 <= schoolMeanDepth <= 2000 --> - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <param name="max">2000</param> - <message>validator.set.bound.schoolMeanDepth##${min}##${max}</message> - </field-validator> - - </field> - - <field name="schoolTopDepth"> - - <!-- 0 <= schoolTopDepth <= 1000 --> - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <param name="max">1000</param> - <message>validator.set.bound.schoolTopDepth##${min}##${max}</message> - </field-validator> - - </field> - - - <field name="supportVesselName"> - - <!-- supportVesselName de ${maxLength} caractères maximum --> - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">maxLength:32</param> - <param name="expression"> - <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> - </param> - <message>validator.set.size.supportVesselName##${ints.maxLength}</message> - </field-validator> - - </field> - - <field name="endPursingDate"> - - <!-- routeEntity.date <= endPursingDate --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ endPursingDate == null || - @org.nuiton.util.DateUtil@getDay(routeEntity.date).time <= endPursingDate.time - ]]> - </param> - <message>validator.set.endPursingDate.after.date</message> - </field-validator> - </field> - - <field name="endPursingTimeStamp"> - - <!-- startTime <= endPursingTimeStamp --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ endPursingTimeStamp == null || - @org.nuiton.util.DateUtil@getDateAndTime(routeEntity.date, startTime, true, false).time <= endPursingTimeStamp.time ]]> - </param> - <message>validator.set.endPursingTimeStamp.after.startTime</message> - </field-validator> - - </field> - - <field name="endSetDate"> - - <!-- endPursingDate <= endSetDate --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ endPursingDate == null || - endPursingDate.time <= endSetDate.time - ]]> - </param> - <message>validator.set.endDate.after.endPursingDate</message> - </field-validator> - </field> - - <field name="endSetTimeStamp"> - - <!-- endPursingTimeStamp < = endSetTimeStamp && endSetTimeStamp - endPursingTimeStamp > 45 minutes --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ endSetTimeStamp == null || endPursingTimeStamp.time <= endSetTimeStamp.time ]]> - </param> - <message>validator.set.endSetTimeStamp.after.endPursingTimeStamp</message> - </field-validator> - - <!-- verifier que la duree de la set est d'au moins 45 minutes --> - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">maxLength:45</param> - <param name="expression"> - <![CDATA[ @org.nuiton.util.DateUtil@getDifferenceInMinutes(endPursingTimeStamp, endSetTimeStamp) >= ints.maxLength ]]> - </param> - <message>validator.set.bound.delay##${ints.maxLength}</message> - </field-validator> - - </field> - - <field name="currentDirection"> - - <!-- 0 <= direction courant <= 360 --> - <field-validator type="int" short-circuit="true"> - <param name="min">0</param> - <param name="max">360</param> - <message>validator.set.bound.currentDirection##${min}##${max}</message> - </field-validator> - - </field> - - <field name="currentSpeed"> - - <!-- 0 < vitesse courant <= 40 --> - <field-validator type="double" short-circuit="true"> - <param name="minExclusive">0</param> - <param name="maxInclusive">40</param> - <message>validator.set.bound.currentSpeed##${minExclusive}##${maxInclusive}</message> - </field-validator> - - </field> - - <field name="comment"> - - <!-- comentaire de moins de 1024 caractères --> - <field-validator type="stringlength"> - <param name="maxLength">1024</param> - <message>validator.set.comment.tobig</message> - </field-validator> - - <!-- comment requis selon le type de reasonForNullSet choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ reasonForNullSet == null || !reasonForNullSet.needComment || (comment!=null && !comment.empty) ]]> - </param> - <message>validator.set.required.comment.for.reasonForNullSet</message> - </field-validator> - - </field> -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-warning-validation.xml deleted file mode 100644 index 6aa639b..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-warning-validation.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="currentDirection"> - - <!-- direction courant non renseigne --> - <field-validator type="required" short-circuit="true"> - <message>validator.set.null.currentDirection</message> - </field-validator> - - </field> - - <field name="endSetTimeStamp"> - - <!-- verifier que la duree de la set n'exède pas 5 heures (300 minutes) --> - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">maxLength:300</param> - <param name="expression"> - <![CDATA[ (@org.nuiton.util.DateUtil@getTime(endSetTimeStamp, false, false).time - @org.nuiton.util.DateUtil@getTime(startTime, false, false).time) <= (ints.maxLength * 60000) ]]> - </param> - <message>validator.set.delay.too.long##${ints.maxLength}</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-error-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-error-validation.xml deleted file mode 100644 index e32342d..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-error-validation.xml +++ /dev/null @@ -1,243 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="observer"> - - <!-- pas de observer selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.observer</message> - </field-validator> - - <!-- observer desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ observer.enabled ]]> - </param> - <message>validator.trip.desactivated.observer</message> - </field-validator> - - </field> - - <field name="captain"> - - <!-- captain desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ captain == null || captain.enabled ]]> - </param> - <message>validator.trip.desactivated.captain</message> - </field-validator> - - </field> - - <field name="dataEntryOperator"> - - <!-- dataEntryOperator desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ dataEntryOperator == null || dataEntryOperator.enabled ]]> - </param> - <message>validator.trip.desactivated.dataEntryOperator</message> - </field-validator> - - </field> - - <field name="vessel"> - - <!-- pas de vessel sélectionné --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.vessel</message> - </field-validator> - - <!-- vessel desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ vessel.enabled ]]> - </param> - <message>validator.trip.desactivated.vessel</message> - </field-validator> - - </field> - - <field name="ocean"> - - <!-- pas d'ocean selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.ocean</message> - </field-validator> - - <!-- ocean desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ ocean == null || ocean.enabled ]]> - </param> - <message>validator.trip.desactivated.ocean</message> - </field-validator> - - </field> - - <field name="departureHarbour"> - - <!-- pas de departureHarbour selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.departureHarbour</message> - </field-validator> - - <!-- departureHarbour desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ departureHarbour.enabled ]]> - </param> - <message>validator.trip.desactivated.departureHarbour</message> - </field-validator> - - </field> - - <field name="landingHarbour"> - - <!-- landingHarbour desactive --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ landingHarbour == null || landingHarbour.enabled ]]> - </param> - <message>validator.trip.desactivated.landingHarbour</message> - </field-validator> - - </field> - - <field name="startDate"> - - <!-- pas de date de debut selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.startDate</message> - </field-validator> - - </field> - - <field name="endDate"> - - <!-- pas de date de fin selectionnee --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.required.endDate</message> - </field-validator> - - <!-- date de fin avant date de debut --> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ endDate == null || endDate.time >= startDate.time ]]> - </param> - <message>validator.trip.endDate.after.startDate</message> - </field-validator> - - </field> - - <field name="formsUrl"> - - <!-- formsUrl url pas valide --> - <field-validator type="url" short-circuit="true"> - <message>validator.trip.invalid.formsUrl</message> - </field-validator> - - </field> - - <field name="reportsUrl"> - - <!-- reportsUrl url pas valide --> - <field-validator type="url" short-circuit="true"> - <message>validator.trip.invalid.reportsUrl</message> - </field-validator> - - </field> - - <field name="comment"> - - <!-- comentaire de moins de 1024 caractères --> - <field-validator type="stringlength"> - <param name="maxLength">1024</param> - <message>validator.trip.comment.tobig</message> - </field-validator> - - <!-- comment requis selon le type de departureHarbour choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ departureHarbour == null || !departureHarbour.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.departureHarbour</message> - </field-validator> - - <!-- comment requis selon le type de landingHarbour choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ landingHarbour == null || !landingHarbour.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.landingHarbour</message> - </field-validator> - - <!-- comment requis selon le type de vessel choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ vessel == null || !vessel.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.vessel</message> - </field-validator> - - <!-- comment requis selon le type de ocean choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ ocean == null || !ocean.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.ocean</message> - </field-validator> - - <!-- comment requis selon le type de dataEntryOperator choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ dataEntryOperator == null || !dataEntryOperator.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.dataEntryOperator</message> - </field-validator> - - <!-- comment requis selon le type de observer choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ observer == null || !observer.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.observer</message> - </field-validator> - - <!-- comment requis selon le type de captain choisi --> - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ captain == null || !captain.needComment || (comment != null && !comment.empty) ]]> - </param> - <message>validator.trip.required.comment.for.captain</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml b/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml deleted file mode 100644 index a39dbb4..0000000 --- a/observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Validation - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="landingHarbour"> - - <!-- pas de landingHarbour selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.null.landingHarbour</message> - </field-validator> - - </field> - - <field name="captain"> - - <!-- pas de captain selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.null.captain</message> - </field-validator> - - </field> - - <field name="dataEntryOperator"> - - <!-- pas de dataEntryOperator selectionne --> - <field-validator type="required" short-circuit="true"> - <message>validator.trip.null.dataEntryOperator</message> - </field-validator> - - </field> - -</validators> diff --git a/observe-services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java b/observe-services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java index a6e2868..4bc32cd 100644 --- a/observe-services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java +++ b/observe-services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java @@ -156,7 +156,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SortedSet<NuitonValidator<?>> validators = detectValidators(ALL_TYPES); assertFalse(validators.isEmpty()); - assertEquals(175, validators.size()); + assertEquals(108, validators.size()); } @@ -164,78 +164,9 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { public void testDetectN1Create() { String contextName = N1_CREATE_CONTEXT_NAME; - validators = detectValidators(Pattern.compile(contextName), - ALL_TYPES - ); + validators = detectValidators(Pattern.compile(contextName), ALL_TYPES); - assertValidatorSetWithSameContextName(validators, contextName, - ActivityLongline.class, - ActivitySeine.class, - BaitHaulingStatus.class, - BaitSettingStatus.class, - BaitType.class, - CatchFateLongline.class, - Country.class, - DetectionMode.class, - EncounterType.class, - FloatingObject.class, - FpaZone.class, - Gear.class, - GearCaracteristic.class, - GearCaracteristicType.class, - Harbour.class, - Healthness.class, - HookPosition.class, - HookSize.class, - HookType.class, - ItemHorizontalPosition.class, - ItemVerticalPosition.class, - LengthWeightParameter.class, - LightsticksColor.class, - LightsticksType.class, - LineType.class, - MaturityStatus.class, - MitigationType.class, - ObjectFate.class, - ObjectOperation.class, - ObjectType.class, - ObservedSystem.class, - Ocean.class, - Organism.class, - Person.class, - Program.class, - ReasonForDiscard.class, - ReasonForNoFishing.class, - ReasonForNullSet.class, - Route.class, - SensorBrand.class, - SensorDataFormat.class, - SensorType.class, - SetLongline.class, - SetSeine.class, - SettingShape.class, - Sex.class, - SizeMeasureType.class, - Species.class, - SpeciesFate.class, - SpeciesGroup.class, - SpeciesList.class, - SpeciesStatus.class, - StomacFullness.class, - SurroundingActivity.class, - TransmittingBuoyOperation.class, - TransmittingBuoyType.class, - TripLongline.class, - TripSeine.class, - TripType.class, - Vessel.class, - VesselActivityLongline.class, - VesselActivitySeine.class, - VesselSizeCategory.class, - VesselType.class, - WeightCategory.class, - WeightMeasureType.class, - Wind.class); + assertValidatorSetWithSameContextName(validators, contextName); } @Test @@ -339,8 +270,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { public void testDetectN1UpdateExt() { String contextName = N1_UPDATE_CONTEXT_NAME; - validators = detectValidators(Pattern.compile(contextName + "-.*"), - ALL_TYPES); + validators = detectValidators(Pattern.compile(contextName + "-.*"), ALL_TYPES); assertValidatorSetWithMultiContextName(validators, contextName + "-encounter", ActivityLongline.class, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.