Author: fdesbois Date: 2010-04-08 10:16:35 +0000 (Thu, 08 Apr 2010) New Revision: 433 Modified: trunk/changelog.txt trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-ui/pom.xml Log: - Change version to 1.2 - Use nuiton-utils, eugene and topia last snapshots - Use getProperty method from TopiaQuery in filters implementations - Change service implementation for ServiceTransformer last version Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/changelog.txt 2010-04-08 10:16:35 UTC (rev 433) @@ -3,8 +3,8 @@ Historique des versions -1.1.2 ------ +1.2 +--- Evolutions ++++++++++ @@ -16,6 +16,13 @@ Anomalies +++++++++ +Dépendances ++++++++++++ + +- **Nuiton-utils** 1.2.1 -> 1.2.2 [http://maven-site.nuiton.org/nuiton-utils] +- **EUGene** 2.0 -> 2.0.1 [http://maven-site.nuiton.org/eugene] +- **ToPIA** 2.3.2.1 -> 2.3.3 [http://maven-site.nuiton.org/topia] + 1.1.1 (patch) ------------- Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/pom.xml 2010-04-08 10:16:35 UTC (rev 433) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -216,9 +216,9 @@ <!-- libraries version --> <i18n.version>1.2.1</i18n.version> - <nuitonutils.version>1.2.1</nuitonutils.version> - <topia.version>2.3.2.1</topia.version> - <eugene.version>2.0</eugene.version> + <nuitonutils.version>1.2.2-SNAPSHOT</nuitonutils.version> + <topia.version>2.3.3-SNAPSHOT</topia.version> + <eugene.version>2.0.1-SNAPSHOT</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> </properties> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/pom.xml 2010-04-08 10:16:35 UTC (rev 433) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java 2010-04-08 10:16:35 UTC (rev 433) @@ -46,26 +46,28 @@ query = prepareQueryForLimit(query); if (StringUtils.isNotEmpty(getBoatName())) { - query.add(boat + "." + Boat.NAME, Op.LIKE, getBoatName().trim() + "%"); + String nameProperty = TopiaQuery.getProperty(boat, Boat.NAME); + query.add(nameProperty, Op.LIKE, getBoatName().trim() + "%"); } if (StringUtils.isNotEmpty(getBoatDistrictCode())) { - query.add(boat + "." + Boat.DISTRICT_CODE, getBoatDistrictCode().trim()); + String districtCodeProperty = + TopiaQuery.getProperty(boat, Boat.DISTRICT_CODE); + query.add(districtCodeProperty, getBoatDistrictCode().trim()); } if (getBoatImmatriculation() != null) { - query.add(boat + "." + Boat.IMMATRICULATION, getBoatImmatriculation()); + String immatriculationProperty = + TopiaQuery.getProperty(boat, Boat.IMMATRICULATION); + query.add(immatriculationProperty, getBoatImmatriculation()); } return query; } @Override public boolean isBoatFiltered() { - return StringUtils.isNotEmpty(getBoatName()) || StringUtils.isNotEmpty(getBoatDistrictCode()) || getBoatImmatriculation() != null; + return StringUtils.isNotEmpty(getBoatName()) || + StringUtils.isNotEmpty(getBoatDistrictCode()) || + getBoatImmatriculation() != null; } - -// @Override -// public boolean isFiltered() { -// return super.isFiltered() || isBoatFiltered(); -// } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-04-08 10:16:35 UTC (rev 433) @@ -46,29 +46,42 @@ String contact = query.getMainAlias(); + // OBSERVER if (getObserver() != null) { - query.add(contact + "." + Contact.OBSERVER, getObserver()); + String observerProperty = + TopiaQuery.getProperty(contact, Contact.OBSERVER); + query.add(observerProperty, getObserver()); } + // Company filter is managed by SamplingFilter because the company is // linked with the sampleRow instead of contact user + if (isSamplingFiltered() || getFromDate() != null || getCompany() != null) { + String sampleRowProperty = + TopiaQuery.getProperty(contact, Contact.SAMPLE_ROW); - if (isSamplingFiltered() || getFromDate() != null || getCompany() != null) { - // Seems to be necessary to have distinct on sampleRows in case of - // fishingZone join. Otherwise multiple contacts for sames sampleRow - // will be returned (Bad count). - query = prepareQueryForSampling(query, contact + "." + Contact.SAMPLE_ROW); + query = prepareQueryForSampling(query, sampleRowProperty); } - query = prepareQueryForBoat(query, contact + "." + Contact.BOAT); + String boatProperty = TopiaQuery.getProperty(contact, Contact.BOAT); + query = prepareQueryForBoat(query, boatProperty); + + // MAMMALS_OBSERVATION and MAMMALS_CAPTURE + String mammalsObsProperty = + TopiaQuery.getProperty(contact, Contact.MAMMALS_OBSERVATION); + String mammalsCaptProperty = + TopiaQuery.getProperty(contact, Contact.MAMMALS_CAPTURE); + if (getMammalsObservation() && getMammalsCapture()) { - query.add(contact + "." + Contact.MAMMALS_OBSERVATION + " = :mammals OR " + contact + "." + Contact.MAMMALS_CAPTURE + " = :mammals"). - addParam("mammals", Boolean.TRUE); + query.add(mammalsObsProperty + " = :mammals OR " + + mammalsCaptProperty + " = :mammals"). + addParam("mammals", Boolean.TRUE); } else if (getMammalsObservation()) { - query.add(contact + "." + Contact.MAMMALS_OBSERVATION, Boolean.TRUE); + query.add(mammalsObsProperty, Boolean.TRUE); } else if (getMammalsCapture()) { - query.add(contact + "." + Contact.MAMMALS_CAPTURE, Boolean.TRUE); + query.add(mammalsCaptProperty, Boolean.TRUE); } + // VALIDATION_PROGRAM List<Object> programValidValues = new ArrayList<Object>(); if (getProgramAccepted()) { programValidValues.add(Boolean.TRUE); @@ -78,10 +91,12 @@ } if (getProgramUndefined()) { programValidValues.add(null); - } - query.add(contact + "." + Contact.VALIDATION_PROGRAM, - programValidValues.toArray()); + } + String programValidProperty = + TopiaQuery.getProperty(contact, Contact.VALIDATION_PROGRAM); + query.add(programValidProperty, programValidValues.toArray()); + // VALIDATION_COMPANY List<Object> companyValidValues = new ArrayList<Object>(); if (getCompanyAccepted()) { companyValidValues.add(Boolean.TRUE); @@ -92,18 +107,27 @@ if (getCompanyUndefined()) { companyValidValues.add(null); } - query.add(contact + "." + Contact.VALIDATION_COMPANY, - companyValidValues.toArray()); + String companyValidProperty = + TopiaQuery.getProperty(contact, Contact.VALIDATION_COMPANY); + query.add(companyValidProperty, companyValidValues.toArray()); + // STATE if (getState() != null) { - query.add(contact + "." + Contact.STATE, getState().ordinal()); + String stateProperty = + TopiaQuery.getProperty(contact, Contact.STATE); + query.add(stateProperty, getState().ordinal()); } + // FROM_DATE if (getFromDate() != null) { - String tideBeginDate = contact + "." + Contact.TIDE_BEGIN_DATE; - String createDate = contact + "." + TopiaEntity.TOPIA_CREATE_DATE; - query.add("(" + tideBeginDate + " IS NOT NULL AND " + tideBeginDate + " >= :fromDate)" + - " OR (" + tideBeginDate + " IS NULL AND " + createDate + " >= :fromDate)"); + String tideBeginDateProperty = + TopiaQuery.getProperty(contact, Contact.TIDE_BEGIN_DATE); + String createDateProperty = + TopiaQuery.getProperty(contact, TopiaEntity.TOPIA_CREATE_DATE); + query.add("(" + tideBeginDateProperty + " IS NOT NULL AND " + + tideBeginDateProperty + " >= :fromDate)" + + " OR (" + tideBeginDateProperty + " IS NULL AND " + + createDateProperty + " >= :fromDate)"); query.addParam("fromDate", getFromDate()); } @@ -112,10 +136,17 @@ @Override public boolean isFiltered() { - return isBoatFiltered() || isSamplingFiltered() || getObserver() != null || - getMammalsObservation() || getMammalsCapture() || - getProgramAccepted() || getProgramRefused() || getProgramUndefined() || - getCompanyAccepted() || getCompanyRefused() || getCompanyUndefined() || + return isBoatFiltered() || + isSamplingFiltered() || + getObserver() != null || + getMammalsObservation() || + getMammalsCapture() || + getProgramAccepted() || + getProgramRefused() || + getProgramUndefined() || + getCompanyAccepted() || + getCompanyRefused() || + getCompanyUndefined() || getState() != null; } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-04-08 10:16:35 UTC (rev 433) @@ -54,12 +54,16 @@ * @since 1.1.2 */ protected TopiaQuery prepareQueryForFishingZone(TopiaQuery query, - String main) { + String sampleRow) { if (StringUtils.isNotEmpty(getSectorName())) { - query.add(main + "." + FishingZone.SECTOR_NAME, getSectorName()); + String sectorNameProperty = + TopiaQuery.getProperty(sampleRow, FishingZone.SECTOR_NAME); + query.add(sectorNameProperty, getSectorName()); } else if (StringUtils.isNotEmpty(getFacadeName())) { - query.add(main + "." + FishingZone.FACADE_NAME, getFacadeName()); + String facadeNameProperty = + TopiaQuery.getProperty(sampleRow, FishingZone.FACADE_NAME); + query.add(facadeNameProperty, getFacadeName()); } return query; @@ -74,8 +78,8 @@ * @return the query with filtered elements added */ @Override - public TopiaQuery prepareQueryForSampling(TopiaQuery query, String main) { - query = prepareQueryForSampling(query, main, null); + public TopiaQuery prepareQueryForSampling(TopiaQuery query, String sampleRow) { + query = prepareQueryForSampling(query, sampleRow, null); return query; } @@ -90,13 +94,13 @@ * @return the query with filtered elements added */ @Override - public TopiaQuery prepareQueryForSampling(TopiaQuery query, String main, + public TopiaQuery prepareQueryForSampling(TopiaQuery query, String sampleRow, String zoneAlias) { // SampleRow filter depends on SampleRow OR sectorName OR facadeName // sectorName and facadeName are the two FishingZone filters known if (getSampleRow() != null) { - query.add(main, getSampleRow()); + query.add(sampleRow, getSampleRow()); // FishingZone filter (sectorName OR facadeName) } else if (StringUtils.isNotEmpty(getSectorName()) || StringUtils.isNotEmpty(getFacadeName())) { @@ -108,41 +112,54 @@ } else { // Otherwise, create a subquery to retrieve sampleRows // corresponding to fishingZone filters + String fishingZoneProperty = + TopiaQuery.getProperty("SR", SampleRow.FISHING_ZONE); TopiaQuery subquery = new TopiaQuery(SampleRow.class, "SR"). addFrom(FishingZone.class, "F"). - add("F IN elements(SR." + SampleRow.FISHING_ZONE + ")"); + add("F IN elements(" + fishingZoneProperty + ")"); subquery = prepareQueryForFishingZone(subquery, "F"); - query.add(main + " IN (" + subquery.fullQuery() + ")"). + query.add(sampleRow + " IN (" + subquery.fullQuery() + ")"). addParams(subquery.getParams()); } } // CodeDCF5 filter if (getCodeDCF5() != null) { - String pProfession = main + "." + SampleRow.PROFESSION + "." + - Profession.CODE_DCF5; - query.add(pProfession, getCodeDCF5()); + String codeDCF5Prop = + TopiaQuery.getProperty(sampleRow, + SampleRow.PROFESSION, + Profession.CODE_DCF5); + query.add(codeDCF5Prop, getCodeDCF5()); } // Program filter if (getProgramName() != null) { - query.add(main + "." + SampleRow.PROGRAM_NAME, getProgramName()); + String programProperty = + TopiaQuery.getProperty(sampleRow, SampleRow.PROGRAM_NAME); + query.add(programProperty, getProgramName()); } + String periodEndProperty = + TopiaQuery.getProperty(sampleRow, SampleRow.PERIOD_END); + String periodBeginProperty = + TopiaQuery.getProperty(sampleRow, SampleRow.PERIOD_BEGIN); + // Period filter on sampleRow dates if (getPeriod() != null) { getPeriod().initDayOfMonthExtremities(); - query.add(main + "." + SampleRow.PERIOD_BEGIN, Op.LT, getPeriod().getThruDate()). - add(main + "." + SampleRow.PERIOD_END, Op.GT, getPeriod().getFromDate()); + query.add(periodBeginProperty, Op.LT, getPeriod().getThruDate()). + add(periodEndProperty, Op.GT, getPeriod().getFromDate()); } else if (getFromDate() != null) { - query.add(main + "." + SampleRow.PERIOD_END, Op.GE, getFromDate()); + query.add(periodEndProperty, Op.GE, getFromDate()); } // Company if (getCompany() != null) { - query.add(main + "." + SampleRow.COMPANY, getCompany()); + String companyProperty = + TopiaQuery.getProperty(sampleRow, SampleRow.COMPANY); + query.add(companyProperty, getCompany()); } if (getNbMonthFinishedFromToday() != null) { @@ -150,7 +167,7 @@ Calendar calendar = new GregorianCalendar(); calendar.setTime(WaoUtils.getCurrentDate()); calendar.add(Calendar.MONTH, getNbMonthFinishedFromToday()); - query.add(main + "." + SampleRow.PERIOD_END, Op.GE, calendar.getTime()); + query.add(periodEndProperty, Op.GE, calendar.getTime()); } return query; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-08 10:16:35 UTC (rev 433) @@ -82,28 +82,22 @@ } @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override protected void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws WaoException { context.treateError(transaction, eee, message, args); } @Override - protected void treateError(Exception eee, String message, - Object... args) throws WaoException { - context.treateError(eee, message, args); - } - - @Override protected void closeTransaction(TopiaContext transaction) { context.closeTransaction(transaction); } @Override - protected TopiaContext beginTransaction() throws TopiaException { - return context.beginTransaction(); - } - - @Override public Map<Integer, Boat> executeGetBoatsByFilter(TopiaContext transaction, BoatFilter filter) throws TopiaException { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-08 10:16:35 UTC (rev 433) @@ -98,28 +98,22 @@ } @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override protected void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws WaoException { context.treateError(transaction, eee, message, args); } @Override - protected void treateError(Exception eee, String message, - Object... args) throws WaoException { - context.treateError(eee, message, args); - } - - @Override protected void closeTransaction(TopiaContext transaction) { context.closeTransaction(transaction); } @Override - protected TopiaContext beginTransaction() throws TopiaException { - return context.beginTransaction(); - } - - @Override public Map<String, Contact> executeGetContacts(TopiaContext transaction, ContactFilter filter) throws TopiaException { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-04-08 10:16:35 UTC (rev 433) @@ -56,28 +56,22 @@ } @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override protected void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws WaoException { context.treateError(transaction, eee, message, args); } @Override - protected void treateError(Exception eee, String message, - Object... args) throws WaoException { - context.treateError(eee, message, args); - } - - @Override protected void closeTransaction(TopiaContext transaction) { context.closeTransaction(transaction); } @Override - protected TopiaContext beginTransaction() throws TopiaException { - return context.beginTransaction(); - } - - @Override public List<News> executeGetNews(TopiaContext transaction) throws TopiaException { NewsDAO dao = WaoDAOHelper.getNewsDAO(transaction); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-04-08 10:16:35 UTC (rev 433) @@ -68,28 +68,22 @@ } @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override protected void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws WaoException { context.treateError(transaction, eee, message, args); } @Override - protected void treateError(Exception eee, String message, - Object... args) throws WaoException { - context.treateError(eee, message, args); - } - - @Override protected void closeTransaction(TopiaContext transaction) { context.closeTransaction(transaction); } @Override - protected TopiaContext beginTransaction() throws TopiaException { - return context.beginTransaction(); - } - - @Override public List<String> executeGetFacades(TopiaContext transaction, SamplingFilter filter) throws TopiaException { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-08 10:16:35 UTC (rev 433) @@ -90,27 +90,21 @@ } @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override protected void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws WaoException { context.treateError(transaction, eee, message, args); } @Override - protected void treateError(Exception eee, String message, - Object... args) throws WaoException { - context.treateError(eee, message, args); - } - - @Override protected void closeTransaction(TopiaContext transaction) { context.closeTransaction(transaction); } - @Override - protected TopiaContext beginTransaction() throws TopiaException { - return context.beginTransaction(); - } - public ServiceSamplingImpl() { prepareBinderForProfession(); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-08 10:16:35 UTC (rev 433) @@ -84,28 +84,22 @@ } @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override protected void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws WaoException { context.treateError(transaction, eee, message, args); } @Override - protected void treateError(Exception eee, String message, - Object... args) throws WaoException { - context.treateError(eee, message, args); - } - - @Override protected void closeTransaction(TopiaContext transaction) { context.closeTransaction(transaction); } @Override - protected TopiaContext beginTransaction() throws TopiaException { - return context.beginTransaction(); - } - - @Override public List<SortedMap<Date, Integer>> executeGetDataSampling( TopiaContext transaction, SamplingFilter filter) throws TopiaException { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-04-08 10:16:35 UTC (rev 433) @@ -70,28 +70,22 @@ } @Override + protected TopiaContext beginTransaction() throws TopiaException { + return context.beginTransaction(); + } + + @Override protected void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws WaoException { context.treateError(transaction, eee, message, args); } @Override - protected void treateError(Exception eee, String message, - Object... args) throws WaoException { - context.treateError(eee, message, args); - } - - @Override protected void closeTransaction(TopiaContext transaction) { context.closeTransaction(transaction); } @Override - protected TopiaContext beginTransaction() throws TopiaException { - return context.beginTransaction(); - } - - @Override public WaoUser executeConnect(TopiaContext transaction, String login, String password) throws TopiaException, WaoBusinessException { Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-04-06 17:26:09 UTC (rev 432) +++ trunk/wao-ui/pom.xml 2010-04-08 10:16:35 UTC (rev 433) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>