[wao] branch develop updated (70764d1 -> ddd83d0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 70764d1 Utilisation de pom 1.5 new b8a646a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8d3a6ea Création d'une branche 4.1.x adds 927f079 Mise à jour du pom pour la branche 4.1.x adds 6509eef Fusion dans la branche 4.1.x des corrections effectuées en 4.0.x adds ce08564 [maven-release-plugin] prepare release wao-4.1 adds c8785db [maven-release-plugin] copy for tag wao-4.1 adds 5196c1d [jgitflow-maven-plugin]updating poms for branch '4.2-RC1' with snapshot versions new dca9291 Ajout des entêtes de licences manquants new a771eb5 [jgitflow-maven-plugin]updating poms for branch'release/4.2-RC1' with non-snapshot versions new a403303 Fusion de la branche de release dans master new 285b92f Merge branch 'master' into develop new ddd83d0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 ddd83d014a593be93d202686865dbe1576515117 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:03:59 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 285b92f4b87ffc4df318b8c57b93715b73e3eb81 Merge: b8a646a a403303 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:03:59 2014 +0200 Merge branch 'master' into develop commit b8a646aa69e30d32fe3b38207076bf2307ed6a51 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:03:58 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a40330314142fa9b0fa6b23b01e75cbcd6965b89 Merge: c8785db a771eb5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:02:34 2014 +0200 Fusion de la branche de release dans master commit a771eb59764fe300bae1f41a11fdded7f34c4e22 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 10:50:42 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.2-RC1' with non-snapshot versions commit dca92911e1349bbda1882f83c9ba1eab33770ea1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 10:48:41 2014 +0200 Ajout des entêtes de licences manquants Summary of changes: pom.xml | 2 +- .../fr/ifremer/wao/WaoTopiaPersistenceContext.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/ContactStates.java | 21 +++++++++++++++++++++ .../service/administration/ReferentialService.java | 1 + .../csv/operations/ContactStateParserFormatter.java | 21 +++++++++++++++++++++ .../wao/web/RedirectToContextPathRootFilter.java | 21 +++++++++++++++++++++ .../ifremer/wao/web/action/EditContactAction.java | 2 +- .../administration/InvalidateAllCachesAction.java | 21 +++++++++++++++++++++ .../administration/invalidate-all-caches-input.jsp | 20 ++++++++++++++++++++ .../WEB-INF/content/templates/td-effort-obsmer.jsp | 20 ++++++++++++++++++++ .../webapp/WEB-INF/content/templates/td-effort.jsp | 20 ++++++++++++++++++++ 11 files changed, 168 insertions(+), 2 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 wao. See http://git.codelutin.com/wao.git commit dca92911e1349bbda1882f83c9ba1eab33770ea1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 10:48:41 2014 +0200 Ajout des entêtes de licences manquants --- .../fr/ifremer/wao/WaoTopiaPersistenceContext.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/ContactStates.java | 21 +++++++++++++++++++++ .../csv/operations/ContactStateParserFormatter.java | 21 +++++++++++++++++++++ .../wao/web/RedirectToContextPathRootFilter.java | 21 +++++++++++++++++++++ .../administration/InvalidateAllCachesAction.java | 21 +++++++++++++++++++++ .../administration/invalidate-all-caches-input.jsp | 20 ++++++++++++++++++++ .../WEB-INF/content/templates/td-effort-obsmer.jsp | 20 ++++++++++++++++++++ .../webapp/WEB-INF/content/templates/td-effort.jsp | 20 ++++++++++++++++++++ 8 files changed, 165 insertions(+) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/WaoTopiaPersistenceContext.java b/wao-persistence/src/main/java/fr/ifremer/wao/WaoTopiaPersistenceContext.java index 53788a5..0a51f25 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/WaoTopiaPersistenceContext.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/WaoTopiaPersistenceContext.java @@ -1,5 +1,26 @@ package fr.ifremer.wao; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.topia.persistence.event.TopiaEntityListener; import org.nuiton.topia.persistence.event.TopiaTransactionListener; diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStates.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStates.java index 3c75d1b..66a04f4 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStates.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStates.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Function; public class ContactStates { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateParserFormatter.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateParserFormatter.java index cb68235..471205f 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateParserFormatter.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateParserFormatter.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.csv.operations; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.ObsProgram; import org.apache.commons.lang3.StringUtils; diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java b/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java index a9927a5..295106c 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/RedirectToContextPathRootFilter.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.web; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/InvalidateAllCachesAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/InvalidateAllCachesAction.java index 9041c19..5370857 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/InvalidateAllCachesAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/InvalidateAllCachesAction.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action.administration; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.services.service.InitWaoService; import fr.ifremer.wao.web.WaoJspActionSupport; import org.nuiton.i18n.I18n; diff --git a/wao-web/src/main/webapp/WEB-INF/content/administration/invalidate-all-caches-input.jsp b/wao-web/src/main/webapp/WEB-INF/content/administration/invalidate-all-caches-input.jsp index 0896101..fa32ae1 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/administration/invalidate-all-caches-input.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/administration/invalidate-all-caches-input.jsp @@ -1,3 +1,23 @@ +<%-- + #%L + Wao :: Web + %% + Copyright (C) 2009 - 2014 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> <%@taglib uri="/struts-tags" prefix="s" %> diff --git a/wao-web/src/main/webapp/WEB-INF/content/templates/td-effort-obsmer.jsp b/wao-web/src/main/webapp/WEB-INF/content/templates/td-effort-obsmer.jsp index 27c5a80..19d25a8 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/templates/td-effort-obsmer.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/templates/td-effort-obsmer.jsp @@ -1,3 +1,23 @@ +<%-- + #%L + Wao :: Web + %% + Copyright (C) 2009 - 2014 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@taglib uri="/struts-tags" prefix="s" %> diff --git a/wao-web/src/main/webapp/WEB-INF/content/templates/td-effort.jsp b/wao-web/src/main/webapp/WEB-INF/content/templates/td-effort.jsp index 3296290..e7fca35 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/templates/td-effort.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/templates/td-effort.jsp @@ -1,3 +1,23 @@ +<%-- + #%L + Wao :: Web + %% + Copyright (C) 2009 - 2014 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@taglib uri="/struts-tags" prefix="s" %> -- 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 wao. See http://git.codelutin.com/wao.git commit a771eb59764fe300bae1f41a11fdded7f34c4e22 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 10:50:42 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.2-RC1' with non-snapshot versions --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1936da2..74c8266 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC1-SNAPSHOT</version> + <version>4.2-RC1</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index a818e41..89e249b 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC1-SNAPSHOT</version> + <version>4.2-RC1</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 899070d..9f7f23b 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC1-SNAPSHOT</version> + <version>4.2-RC1</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index a27ea24..c574f6e 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC1-SNAPSHOT</version> + <version>4.2-RC1</version> </parent> <artifactId>wao-web</artifactId> -- 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 wao. See http://git.codelutin.com/wao.git commit a40330314142fa9b0fa6b23b01e75cbcd6965b89 Merge: c8785db a771eb5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:02:34 2014 +0200 Fusion de la branche de release dans master .gitignore | 4 + pom.xml | 87 +++++-- wao-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/wao/BoatsFilter.java | 10 +- .../main/java/fr/ifremer/wao/ContactsFilter.java | 22 +- .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 33 +-- .../fr/ifremer/wao/WaoTopiaPersistenceContext.java | 60 +++++ .../src/main/java/fr/ifremer/wao/WaoUtils.java | 106 ++++---- .../java/fr/ifremer/wao/entity/ContactImpl.java | 9 +- .../java/fr/ifremer/wao/entity/ContactState.java | 108 ++++---- .../java/fr/ifremer/wao/entity/ContactStates.java} | 38 +-- .../fr/ifremer/wao/entity/ContactTopiaDao.java | 2 +- ...2__average_tide_time_to_int,_clean_defaults.sql | 29 +++ .../i18n/wao-persistence_en_GB.properties | 2 + .../i18n/wao-persistence_fr_FR.properties | 2 + wao-persistence/src/main/xmi/wao-model.properties | 2 +- wao-persistence/src/main/xmi/wao-model.zargo | Bin 59675 -> 59661 bytes .../src/test/java/fr/ifremer/wao/WaoUtilsTest.java | 46 ++++ .../fr/ifremer/wao/entity/ContactImplTest.java | 52 ---- .../fr/ifremer/wao/entity/ContactStateTest.java | 21 ++ .../ifremer/wao/entity/SampleRowLogImplTest.java | 2 +- wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 4 + .../wao/services/service/AbstractFilterValues.java | 10 +- .../wao/services/service/BoatsFilterValues.java | 5 +- .../wao/services/service/ContactsFilterValues.java | 62 ++++- .../wao/services/service/ContactsService.java | 6 +- .../ifremer/wao/services/service/FilterOption.java | 22 +- .../wao/services/service/InitWaoService.java | 17 ++ .../wao/services/service/ObsMerSamplingPlan.java | 157 ++++-------- .../service/ObsMerSamplingPlanBuilder.java | 282 +++++++++------------ .../service/ObsMerSamplingPlanService.java | 153 ++++------- .../wao/services/service/ObsVenteSamplingPlan.java | 8 +- .../service/ObsVenteSamplingPlanBuilder.java | 34 +-- .../services/service/SampleRowsFilterValues.java | 16 +- .../ifremer/wao/services/service/SamplingPlan.java | 219 +++++++--------- .../wao/services/service/SamplingPlanCacheKey.java | 12 + .../wao/services/service/SamplingPlanService.java | 5 +- .../service/administration/ReferentialService.java | 74 +----- .../service/csv/ContactImportExportModel.java | 7 +- ...bsMerObsVenteSamplingPlanImportExportModel.java | 2 +- .../service/csv/ObsMerSamplingPlanExportModel.java | 71 +++++- .../operations/ContactStateParserFormatter.java | 83 ++++++ .../wao/services/service/mail/EmailService.java | 4 +- .../service/mail/MammalsObservationEmail.java | 8 +- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../service/ObsMerSamplingPlanServiceTest.java | 12 +- wao-web/pom.xml | 2 +- ...er.java => CacheInvalidationTopiaListener.java} | 6 +- .../wao/web/DefaultWaoApplicationContext.java | 8 +- .../wao/web/RedirectToContextPathRootFilter.java | 68 +++++ .../fr/ifremer/wao/web/WaoJspActionSupport.java | 20 ++ .../wao/web/action/AbstractSamplingPlanAction.java | 9 +- .../fr/ifremer/wao/web/action/BoatsAction.java | 6 +- .../fr/ifremer/wao/web/action/ContactsAction.java | 12 +- .../web/action/ContactsFilterValuesJsonAction.java | 23 +- .../ifremer/wao/web/action/EditContactAction.java | 29 ++- .../fr/ifremer/wao/web/action/SynthesisAction.java | 4 +- .../wao/web/action/ValidateContactJsonAction.java | 9 +- .../administration/InvalidateAllCachesAction.java | 47 ++++ .../web/WaoJspActionSupport-conversion.properties | 21 ++ .../main/resources/i18n/wao-web_en_GB.properties | 6 + .../main/resources/i18n/wao-web_fr_FR.properties | 6 + .../administration/invalidate-all-caches-input.jsp | 49 ++++ .../administration/referential-management.jsp | 8 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 19 +- .../webapp/WEB-INF/content/edit-contact-input.jsp | 6 +- .../WEB-INF/content/obsmer/sampling-plan.jsp | 261 +++++++------------ .../WEB-INF/content/obsvente/sampling-plan.jsp | 125 +++------ .../src/main/webapp/WEB-INF/content/synthesis.jsp | 2 +- .../WEB-INF/content/templates/td-effort-obsmer.jsp | 33 +++ .../webapp/WEB-INF/content/templates/td-effort.jsp | 52 ++++ .../webapp/WEB-INF/decorators/layout-login.jsp | 2 - .../src/main/webapp/WEB-INF/decorators/layout.jsp | 59 ++++- wao-web/src/main/webapp/WEB-INF/web.xml | 11 + wao-web/src/main/webapp/endpoints-js.jsp | 39 --- wao-web/src/main/webapp/wao.css | 36 +-- wao-web/src/main/webapp/wao.js | 51 ++-- 79 files changed, 1640 insertions(+), 1303 deletions(-) diff --cc pom.xml index d7130a6,74c8266..c109f10 --- a/pom.xml +++ b/pom.xml @@@ -4,8 -4,8 +4,8 @@@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>5.0.8</version> - <artifactId>pom</artifactId> ++ <artifactId>codelutinpom</artifactId> + <version>1.5</version> </parent> <groupId>fr.ifremer</groupId> diff --cc wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java index 0e2b3ae,baa8d89..9d7533a --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java @@@ -29,8 -29,8 +29,9 @@@ import com.google.common.base.Precondit import com.google.common.base.Splitter; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; + import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.google.common.collect.Iterables; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatTopiaDao; diff --cc wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java index a927104,ddc28fd..a545b39 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java @@@ -346,4 -357,8 +357,8 @@@ public class EditContactAction extends } - } + public int getReturnToPageNumber() { + return returnToPageNumber; + } + -} ++} -- 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 wao. See http://git.codelutin.com/wao.git commit b8a646aa69e30d32fe3b38207076bf2307ed6a51 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:03:58 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d8c141c..74c8266 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-RC1</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 898f5b0..89e249b 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-RC1</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 342d943..9f7f23b 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-RC1</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 98b2632..c574f6e 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-SNAPSHOT</version> + <version>4.2-RC1</version> </parent> <artifactId>wao-web</artifactId> -- 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 wao. See http://git.codelutin.com/wao.git commit 285b92f4b87ffc4df318b8c57b93715b73e3eb81 Merge: b8a646a a403303 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:03:59 2014 +0200 Merge branch 'master' into develop pom.xml | 2 +- .../fr/ifremer/wao/WaoTopiaPersistenceContext.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/ContactStates.java | 21 +++++++++++++++++++++ .../service/administration/ReferentialService.java | 1 + .../csv/operations/ContactStateParserFormatter.java | 21 +++++++++++++++++++++ .../wao/web/RedirectToContextPathRootFilter.java | 21 +++++++++++++++++++++ .../ifremer/wao/web/action/EditContactAction.java | 2 +- .../administration/InvalidateAllCachesAction.java | 21 +++++++++++++++++++++ .../administration/invalidate-all-caches-input.jsp | 20 ++++++++++++++++++++ .../WEB-INF/content/templates/td-effort-obsmer.jsp | 20 ++++++++++++++++++++ .../webapp/WEB-INF/content/templates/td-effort.jsp | 20 ++++++++++++++++++++ 11 files changed, 168 insertions(+), 2 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 wao. See http://git.codelutin.com/wao.git commit ddd83d014a593be93d202686865dbe1576515117 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:03:59 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c109f10..a6b506d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC1</version> + <version>4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 89e249b..898f5b0 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC1</version> + <version>4.2-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 9f7f23b..342d943 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC1</version> + <version>4.2-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index c574f6e..98b2632 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC1</version> + <version>4.2-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm