Author: bleny Date: 2014-05-27 10:04:11 +0200 (Tue, 27 May 2014) New Revision: 1980 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1980 Log: fix some build issues Modified: trunk/wao-services/pom.xml trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-05-26 16:08:16 UTC (rev 1979) +++ trunk/wao-services/pom.xml 2014-05-27 08:04:11 UTC (rev 1980) @@ -36,6 +36,11 @@ </dependency> <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> <groupId>com.github.spullara.mustache.java</groupId> <artifactId>compiler</artifactId> </dependency> Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-26 16:08:16 UTC (rev 1979) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-27 08:04:11 UTC (rev 1980) @@ -202,6 +202,11 @@ updateContactCommand.setCreation(false); + String mainObserverId = contact.getMainObserver().getTopiaId(); + updateContactCommand.setMainObserverId(mainObserverId); + Set<String> secondaryObserversTopiaIds = contact.getSecondaryObserversTopiaIds(); + updateContactCommand.setSecondaryObserverIds(secondaryObserversTopiaIds); + } else { contact = new ContactImpl(); @@ -213,11 +218,6 @@ updateContactCommand.setCreation(true); } - String mainObserverId = contact.getMainObserver().getTopiaId(); - updateContactCommand.setMainObserverId(mainObserverId); - Set<String> secondaryObserversTopiaIds = contact.getSecondaryObserversTopiaIds(); - updateContactCommand.setSecondaryObserverIds(secondaryObserversTopiaIds); - return updateContactCommand; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-05-26 16:08:16 UTC (rev 1979) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-05-27 08:04:11 UTC (rev 1980) @@ -567,7 +567,7 @@ /** * @param region may be null, and all ports will be returned - * @returns all the ports that are in a region + * @return all the ports that are in a region */ public List<TerrestrialLocation> getAllPorts(TerrestrialLocation region) {