branch develop updated (c4d6063 -> d2bcd62)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from c4d6063 generic format import action only from menu + improve select popup open (add a timer for this) new 538357d fixes #6879: [TECH] Passer sur adagio 3.8.6.1 (sur la version 3.14.x) new d2bcd62 add comment The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d2bcd622da474af16e89358343437aa2ff0c70ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 16:38:06 2015 +0200 add comment commit 538357dab250d45bb5735837a761b812f481d2c0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 17:13:51 2015 +0200 fixes #6879: [TECH] Passer sur adagio 3.8.6.1 (sur la version 3.14.x) Summary of changes: pom.xml | 3 +- .../CaracteristicPersistenceServiceImpl.java | 4 +- .../referential/GearPersistenceServiceImpl.java | 56 +++++----------------- .../LocationPersistenceServiceImpl.java | 11 +++-- .../referential/PersonPersistenceServiceImpl.java | 24 ++++------ .../ReferentialPersistenceServiceSupport.java | 5 +- .../referential/SpeciesPersistenceServiceImpl.java | 3 +- .../referential/VesselPersistenceServiceImpl.java | 25 ++++------ .../src/main/resources/queries-failsafe.hbm.xml | 36 +++++++------- 9 files changed, 63 insertions(+), 104 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 538357dab250d45bb5735837a761b812f481d2c0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 17:13:51 2015 +0200 fixes #6879: [TECH] Passer sur adagio 3.8.6.1 (sur la version 3.14.x) --- pom.xml | 2 +- .../CaracteristicPersistenceServiceImpl.java | 4 +- .../referential/GearPersistenceServiceImpl.java | 56 +++++----------------- .../LocationPersistenceServiceImpl.java | 11 +++-- .../referential/PersonPersistenceServiceImpl.java | 24 ++++------ .../ReferentialPersistenceServiceSupport.java | 5 +- .../referential/SpeciesPersistenceServiceImpl.java | 3 +- .../referential/VesselPersistenceServiceImpl.java | 25 ++++------ .../src/main/resources/queries-failsafe.hbm.xml | 36 +++++++------- 9 files changed, 62 insertions(+), 104 deletions(-) diff --git a/pom.xml b/pom.xml index 101f5b7..f5dd7a2 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.9</slf4jVersion> <adagioSharedVersion>3.8.3</adagioSharedVersion> - <adagioVersion>3.8.3-campaign</adagioVersion> + <adagioVersion>3.8.6.1</adagioVersion> <bluecoveVersion>2.1.0</bluecoveVersion> <hibernateVersion>4.3.7.Final</hibernateVersion> <springVersion>4.1.4.RELEASE</springVersion> diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java index d90e163..d65bd78 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java @@ -285,7 +285,7 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS result.setMaximumNumberDecimals((Integer) source[8]); result.setPrecision((Float) source[9]); result.setUnit((String) source[10]); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[11], result); + setStatus((String) source[11], result); if (Caracteristics.isQualitativeCaracteristic(result)) { @@ -302,7 +302,7 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS target2.setId(String.valueOf(source2[0])); target2.setName(String.valueOf(source2[1])); target2.setDescription(String.valueOf(source2[2])); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source2[3], target2); + setStatus((String) source2[3], target2); values.add(target2); } result.setQualitativeValue(Collections.unmodifiableList(values)); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java index 45b9aeb..bca672a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java @@ -28,7 +28,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.referential.StatusCode; import fr.ifremer.adagio.core.dao.referential.gear.FishingGearExtendDao; -import fr.ifremer.adagio.core.dao.referential.gear.GearClassification; import fr.ifremer.adagio.core.dao.referential.gear.GearClassificationId; import fr.ifremer.adagio.core.dao.referential.gear.GearClassificationImpl; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -115,12 +114,9 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup @Override public List<Gear> addTemporaryGears(List<Gear> gears) { - fr.ifremer.adagio.core.dao.referential.Status status = - statusDao.load(StatusCode.TEMPORARY.getValue()); - List<Gear> result = Lists.newArrayList(); for (Gear source : gears) { - Gear added = addTemporaryGear(source, status); + Gear added = addTemporaryGear(source); result.add(added); } return Collections.unmodifiableList(result); @@ -130,12 +126,9 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup @Override public List<Gear> updateTemporaryGears(List<Gear> gears) { - fr.ifremer.adagio.core.dao.referential.Status status = - statusDao.load(StatusCode.TEMPORARY.getValue()); - List<Gear> result = Lists.newArrayList(); for (Gear source : gears) { - Gear updated = updateTemporaryGear(source, status); + Gear updated = updateTemporaryGear(source); result.add(updated); } return Collections.unmodifiableList(result); @@ -208,34 +201,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup } - protected Gear importTemporaryGear(Gear source, fr.ifremer.adagio.core.dao.referential.Status status) { - - Preconditions.checkNotNull(source); - Preconditions.checkNotNull(source.getLabel()); - Preconditions.checkNotNull(source.getName()); - - Integer gearClassificationId = getGearClassificationId(source); - - Gear result; - if (source.getId() != null) { - result = getGear(source.getIdAsInt()); - - } else { - fr.ifremer.adagio.core.dao.referential.gear.Gear target = fishingGearDao.createAsTemporary(source.getLabel(), source.getName(), gearClassificationId); - result = Gears.newGear(); - result.setId(target.getId()); - } - - // Fill the result bean - result.setLabel(source.getLabel()); - result.setName(source.getName()); - result.setScientificGear(source.isScientificGear()); - setStatus(status, result); - return result; - - } - - protected Gear addTemporaryGear(Gear source, fr.ifremer.adagio.core.dao.referential.Status status) { + protected Gear addTemporaryGear(Gear source) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getLabel()); @@ -252,12 +218,13 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup result.setLabel(source.getLabel()); result.setName(source.getName()); result.setScientificGear(source.isScientificGear()); - setStatus(status, result); + setStatus(StatusCode.TEMPORARY.getValue(), result); + return result; } - protected Gear updateTemporaryGear(Gear source, fr.ifremer.adagio.core.dao.referential.Status status) { + protected Gear updateTemporaryGear(Gear source) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getId()); @@ -271,7 +238,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup result.setLabel(source.getLabel()); result.setName(source.getName()); result.setScientificGear(source.isScientificGear()); - setStatus(status, result); + setStatus(StatusCode.TEMPORARY.getValue(), result); fr.ifremer.adagio.core.dao.referential.gear.FishingGear toUpdate = fishingGearDao.load(source.getIdAsInt()); toUpdate.setLabel(result.getLabel()); @@ -302,7 +269,6 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup Preconditions.checkNotNull(source.getName()); Preconditions.checkArgument(Gears.isTemporaryId(source.getIdAsInt())); - Object[] row = queryUniqueWithStatus( "gearByName", "gearName", StringType.INSTANCE, source.getName()); @@ -312,20 +278,20 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup } - protected Gear loadGear(Object[] source) { + protected Gear loadGear(Object... source) { Gear result = Gears.newGear(); result.setId(String.valueOf(source[0])); result.setLabel((String) source[1]); result.setName((String) source[2]); - GearClassification classification = (GearClassification) source[3]; + Integer classification = (Integer) source[3]; boolean scientific = false; if (classification != null) { - scientific = classification.getId().equals(GearClassificationId.SCIENTIFIC_CRUISE.getValue()); + scientific = GearClassificationId.SCIENTIFIC_CRUISE.getValue().equals(classification); } result.setScientificGear(scientific); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[4], result); + setStatus((String) source[4], result); return result; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java index 67301db..cd70ed1 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java @@ -182,10 +182,12 @@ public class LocationPersistenceServiceImpl extends ReferentialPersistenceServic "locationById", "locationId", IntegerType.INSTANCE, Integer.valueOf(id) ); + TuttiLocation target; if (source == null) { - return null; + target = null; + } else { + target = loadLocation(source); } - TuttiLocation target = loadLocation(source); return target; } @@ -216,12 +218,13 @@ public class LocationPersistenceServiceImpl extends ReferentialPersistenceServic return result; } - protected TuttiLocation loadLocation(Object[] source) { + protected TuttiLocation loadLocation(Object... source) { TuttiLocation target = TuttiLocations.newTuttiLocation(); target.setId((Integer) source[0]); target.setLabel((String) source[1]); target.setName((String) source[2]); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[3], target); + String statusCode = (String) source[3]; + setStatus(statusCode, target); return target; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java index de6abc3..7d9733b 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java @@ -116,12 +116,9 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS @Override public List<Person> addTemporaryPersons(List<Person> persons) { - fr.ifremer.adagio.core.dao.referential.Status status = - statusDao.load(StatusCode.TEMPORARY.getValue()); - List<Person> result = Lists.newArrayList(); for (Person source : persons) { - Person added = addTemporaryPerson(source, status); + Person added = addTemporaryPerson(source); result.add(added); } return Collections.unmodifiableList(result); @@ -131,12 +128,9 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS @Override public List<Person> updateTemporaryPersons(List<Person> persons) { - fr.ifremer.adagio.core.dao.referential.Status status = - statusDao.load(StatusCode.TEMPORARY.getValue()); - List<Person> result = Lists.newArrayList(); for (Person source : persons) { - Person updated = updateTemporaryPerson(source, status); + Person updated = updateTemporaryPerson(source); result.add(updated); } return Collections.unmodifiableList(result); @@ -218,7 +212,7 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS } - protected Person addTemporaryPerson(Person source, fr.ifremer.adagio.core.dao.referential.Status status) { + protected Person addTemporaryPerson(Person source) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getFirstName()); @@ -234,12 +228,12 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS // Fill the result bean result.setLastName(source.getLastName()); result.setFirstName(source.getFirstName()); - setStatus(status, result); + setStatus(StatusCode.TEMPORARY.getValue(), result); return result; } - protected Person updateTemporaryPerson(Person source, fr.ifremer.adagio.core.dao.referential.Status status) { + protected Person updateTemporaryPerson(Person source) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getFirstName()); @@ -252,7 +246,7 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS // Fill the result bean result.setLastName(source.getLastName()); result.setFirstName(source.getFirstName()); - setStatus(status, result); + setStatus(StatusCode.TEMPORARY.getValue(), result); PersonVO toUpdate = new PersonVO(); toUpdate.setId(source.getIdAsInt()); @@ -260,7 +254,7 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS toUpdate.setFirstname(source.getFirstName()); toUpdate.setDepartmentId(DepartmentId.UNKNOWN_RECORDER_DEPARTMENT.getValue()); toUpdate.setCreationDate(personDao.load(source.getIdAsInt()).getCreationDate()); - toUpdate.setStatusCode(status.getCode()); + toUpdate.setStatusCode(StatusCode.TEMPORARY.getValue()); personDao.save(toUpdate); return result; @@ -285,14 +279,14 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS } - protected Person loadPerson(Object[] source) { + protected Person loadPerson(Object... source) { Person target = Persons.newPerson(); target.setId(String.valueOf(source[0])); target.setLastName((String) source[1]); target.setFirstName((String) source[2]); target.setDepartment((String) source[3]); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[4], target); + setStatus((String) source[4], target); return target; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java index c5d0727..278f62f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java @@ -45,7 +45,7 @@ import java.util.Iterator; public abstract class ReferentialPersistenceServiceSupport extends AbstractPersistenceService { @Resource(name = "statusDao") - protected StatusDao statusDao; + private StatusDao statusDao; @Resource(name = "cacheService") protected CacheService cacheService; @@ -70,8 +70,9 @@ public abstract class ReferentialPersistenceServiceSupport extends AbstractPersi return (Object[]) result; } - protected <E extends TuttiReferentialEntity> void setStatus(fr.ifremer.adagio.core.dao.referential.Status status, E entity) { + protected <E extends TuttiReferentialEntity> void setStatus(String statusCode, E entity) { Status newStatus = Statuss.newStatus(); + fr.ifremer.adagio.core.dao.referential.Status status = statusDao.load(statusCode); newStatus.setId(status.getCode()); newStatus.setName(status.getName()); entity.setStatus(newStatus); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java index 1b93da6..880c4f1 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java @@ -350,8 +350,7 @@ public class SpeciesPersistenceServiceImpl extends ReferentialPersistenceService target.setExternalCode(source.getExternalCode()); target.setReferenceTaxonId(source.getReferenceTaxonId()); target.setReferenceTaxon(source.getIsReference()); - fr.ifremer.adagio.core.dao.referential.Status status = statusDao.load(source.getStatus().getValue()); - setStatus(status, target); + setStatus(source.getStatus().getValue(), target); return target; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java index fb6e7bc..926aace 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java @@ -27,7 +27,6 @@ package fr.ifremer.tutti.persistence.service.referential; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.data.vessel.VesselExtendDao; -import fr.ifremer.adagio.core.dao.referential.Status; import fr.ifremer.adagio.core.dao.referential.StatusCode; import fr.ifremer.adagio.core.dao.referential.VesselTypeId; import fr.ifremer.adagio.core.dao.referential.location.LocationExtendDao; @@ -202,12 +201,9 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS throw new DataIntegrityViolationException("Default country location not found, with label=" + LocationLabel.FRANCE.getValue()); } - fr.ifremer.adagio.core.dao.referential.Status status = - statusDao.load(StatusCode.TEMPORARY.getValue()); - List<Vessel> result = Lists.newArrayList(); for (Vessel source : vessels) { - Vessel added = addTemporaryVessel(source, countryLocationId, status); + Vessel added = addTemporaryVessel(source, countryLocationId); result.add(added); } return Collections.unmodifiableList(result); @@ -225,13 +221,12 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS throw new DataIntegrityViolationException("Default country location not found, with label=" + LocationLabel.FRANCE.getValue()); } - fr.ifremer.adagio.core.dao.referential.Status status = - statusDao.load(StatusCode.TEMPORARY.getValue()); - List<Vessel> result = Lists.newArrayList(); for (Vessel source : vessels) { - Vessel updated = updateTemporaryVessel(source, countryLocationId, status); + Vessel updated = updateTemporaryVessel(source, countryLocationId); result.add(updated); + source = updateTemporaryVessel(source, countryLocationId); + result.add(source); } return Collections.unmodifiableList(result); @@ -331,7 +326,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS } - protected Vessel addTemporaryVessel(Vessel source, Integer registrationLocationId, fr.ifremer.adagio.core.dao.referential.Status status) { + protected Vessel addTemporaryVessel(Vessel source, Integer registrationLocationId) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getName()); @@ -355,12 +350,12 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS result.setRegistrationCode(source.getRegistrationCode()); result.setInternationalRegistrationCode(source.getInternationalRegistrationCode()); result.setScientificVessel(source.isScientificVessel()); - setStatus(status, result); + setStatus(StatusCode.TEMPORARY.getValue(), result); return result; } - protected Vessel updateTemporaryVessel(Vessel source, Integer countryLocationId, Status status) { + protected Vessel updateTemporaryVessel(Vessel source, Integer countryLocationId) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getId()); @@ -374,7 +369,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS result.setRegistrationCode(source.getRegistrationCode()); result.setInternationalRegistrationCode(source.getInternationalRegistrationCode()); result.setScientificVessel(source.isScientificVessel()); - setStatus(status, result); + setStatus(StatusCode.TEMPORARY.getValue(), result); Integer vesselTypeId = getVesselTypeId(source); @@ -421,7 +416,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS } - protected Vessel loadVessel(Object[] source) { + protected Vessel loadVessel(Object... source) { Vessel target = Vessels.newVessel(); target.setId((String) source[0]); @@ -431,7 +426,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS Integer vesselTypeId = (Integer) source[4]; boolean scientificVessel = VesselTypeId.SCIENTIFIC_RESEARCH_VESSEL.getValue().equals(vesselTypeId); target.setScientificVessel(scientificVessel); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[5], target); + setStatus((String) source[5], target); return target; } diff --git a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml index fe0e2f3..3c862d6 100644 --- a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml +++ b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml @@ -1015,7 +1015,7 @@ p.maximumNumberDecimals, p.precision, case when (p.unit.id = :unitIdNone) then '' else p.unit.symbol end AS symbol, - p.status AS status + p.status.code AS statusCode FROM PmfmImpl p WHERE p.status.code IN (:statusValidCode, :statusTemporaryCode) @@ -1035,7 +1035,7 @@ qv.id AS id, qv.name, case when (qv.description is null OR qv.name = qv.description) then qv.name else concat(qv.name, ' - ', qv.description) end AS description, - qv.status AS status + qv.status.code AS statusCode FROM PmfmImpl p JOIN p.qualitativeValues qv WHERE @@ -1062,7 +1062,7 @@ p.maximumNumberDecimals, p.precision, case when (p.unit.id = :unitIdNone) then '' else p.unit.symbol end AS symbol, - p.status AS status + p.status.code AS statusCode FROM PmfmImpl p WHERE p.status.code IN (:statusValidCode, :statusTemporaryCode) @@ -1080,7 +1080,7 @@ l.id as locationId, l.label as locationLabel, l.name as locationName, - l.status as status + l.status.code as statusCode FROM LocationImpl l WHERE l.locationLevel.id = :locationLevelId @@ -1100,7 +1100,7 @@ l.id as locationId, l.label as locationLabel, l.name as locationName, - l.status as status + l.status.code as statusCode FROM LocationImpl l WHERE @@ -1145,7 +1145,7 @@ l.id as locationId, l.label as locationLabel, l.name as locationName, - l.status as status + l.status.code as statusCode FROM LocationImpl l, LocationHierarchyImpl lh @@ -1174,7 +1174,7 @@ vrp.internationalRegistrationCode as internationalRegistrationCode, vf.name AS vesselName, v.vesselType.id AS vesselTypeId, - v.status AS status + v.status.code AS statusCode FROM VesselImpl v INNER JOIN v.vesselRegistrationPeriods AS vrp @@ -1203,7 +1203,7 @@ vrp.internationalRegistrationCode as internationalRegistrationCode, vf.name AS vesselName, v.vesselType.id AS vesselTypeId, - v.status AS status + v.status.code AS statusCode FROM VesselImpl v INNER JOIN v.vesselRegistrationPeriods AS vrp @@ -1231,7 +1231,7 @@ vrp.internationalRegistrationCode as internationalRegistrationCode, vf.name AS vesselName, v.vesselType.id AS vesselTypeId, - v.status AS status + v.status.code AS statusCode FROM VesselImpl v INNER JOIN v.vesselRegistrationPeriods AS vrp @@ -1257,8 +1257,8 @@ g.id, g.label, g.name, - g.gearClassification, - g.status AS status + g.gearClassification.id, + g.status.code AS statusCode FROM GearImpl g WHERE g.gearClassification.id= :gearClassificiationId @@ -1276,8 +1276,8 @@ g.id, g.label, g.name, - g.gearClassification, - g.status AS status + g.gearClassification.id, + g.status.code AS statusCode FROM GearImpl g WHERE g.id = :gearId @@ -1295,8 +1295,8 @@ g.id, g.label, g.name, - g.gearClassification, - g.status AS status + g.gearClassification.id, + g.status.code AS statusCode FROM GearImpl g WHERE g.name = :gearName @@ -1315,7 +1315,7 @@ p.lastname, p.firstname, p.department.code, - p.status + p.status.code as statusCode FROM PersonImpl p LEFT OUTER JOIN p.profils pp @@ -1344,7 +1344,7 @@ p.lastname, p.firstname, p.department.code, - p.status + p.status.code as statusCode FROM PersonImpl p WHERE p.id = :personId @@ -1363,7 +1363,7 @@ p.lastname, p.firstname, p.department.code, - p.status + p.status.code as statusCode FROM PersonImpl p WHERE p.firstname = :personFirstName -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d2bcd622da474af16e89358343437aa2ff0c70ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 16:38:06 2015 +0200 add comment --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index f5dd7a2..640d74c 100644 --- a/pom.xml +++ b/pom.xml @@ -138,6 +138,7 @@ <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.9</slf4jVersion> <adagioSharedVersion>3.8.3</adagioSharedVersion> + <!-- Can't use now adagio previous to 3.9.1 after this version --> <adagioVersion>3.8.6.1</adagioVersion> <bluecoveVersion>2.1.0</bluecoveVersion> <hibernateVersion>4.3.7.Final</hibernateVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm