branch develop updated (c605cda -> 8508aa6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from c605cda [jgitflow-maven-plugin]updating poms for 2.13-SNAPSHOT development new 144b255 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 1ae388a [jgitflow-maven-plugin]updating poms for 2.12 branch with snapshot versions new 1b4af50 [jgitflow-maven-plugin]updating poms for branch'release/2.12' with non-snapshot versions new f326335 [jgitflow-maven-plugin]merging 'release/2.12' into 'master' new 3ab50c6 [jgitflow-maven-plugin]merging 'master' into 'develop' new 8508aa6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 8508aa64641d03e4aa5b825fb56a9acea7da1126 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 08:29:55 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3ab50c60364c237168ad3cb40ea131ef95fbfd9a Merge: 144b255 f326335 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 08:29:55 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 144b255feaddb1945aa341f90346df2f37989a11 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 08:29:55 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f3263357785de4fbcc07ac9f2f39ec92ed9f91d6 Merge: b9ffba5 1b4af50 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 08:29:53 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.12' into 'master' commit 1b4af505c1062ab6f7f1e31706b354847cd2288a Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 08:27:33 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.12' with non-snapshot versions Summary of changes: -- 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 echobase. See http://git.codelutin.com/echobase.git commit 1b4af505c1062ab6f7f1e31706b354847cd2288a Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 08:27:33 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.12' with non-snapshot versions --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 47cc3fc..98d78f0 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.12</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 72193b8..f05bab2 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.12</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index aeb73bc..cc08b52 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.12</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index e17a271..b0a7e42 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12-SNAPSHOT</version> + <version>2.12</version> <modules> <module>echobase-domain</module> -- 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 echobase. See http://git.codelutin.com/echobase.git commit f3263357785de4fbcc07ac9f2f39ec92ed9f91d6 Merge: b9ffba5 1b4af50 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 08:29:53 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.12' into 'master' echobase-ui/README.txt => README.md | 0 .../README.txt => echobase-domain/README.md | 0 echobase-domain/pom.xml | 2 +- .../README.txt => echobase-services/README.md | 0 echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 5 +- .../service/removedata/RemoveDataService.java | 40 +- README.txt => echobase-ui/README.md | 0 echobase-ui/pom.xml | 9 +- echobase-ui/src/main/assembly/embedded-zip.xml | 4 +- echobase-ui/src/main/assembly/full-war.xml | 2 +- .../echobase/ui/EchoBaseApplicationContext.java | 36 +- .../importData/AbstractConfigureImport.java | 4 + .../actions/importData/ConfigureCommonImport.java | 84 ++++- .../echobase/ui/actions/importDb/Configure.java | 4 + .../ui/actions/removeData/ConfirmDelete.java | 25 +- ...onImport-configureCommon-modeAll-validation.xml | 28 +- ...ort-configureCommon-modeTransect-validation.xml | 14 +- ...port-configureCommon-modeTransit-validation.xml | 8 +- ...mport-configureCommon-modeVoyage-validation.xml | 14 +- echobase-ui/src/main/resources/struts.properties | 22 ++ echobase-ui/src/main/resources/struts.xml | 1 - .../src/main/webapp/WEB-INF/includes/metas.jsp | 28 +- .../jsp/importData/configureAcousticImport.jsp | 1 + .../jsp/importData/configureCatchesImport.jsp | 2 +- .../jsp/importData/configureCommonImport.jsp | 67 ++-- .../jsp/importData/configureOperationImport.jsp | 7 + .../jsp/importData/configureResultsImport.jsp | 2 + .../main/webapp/WEB-INF/jsp/importDb/configure.jsp | 7 + pom.xml | 16 +- src/site/en/rst/db.rst | 97 ++--- src/site/en/rst/exportData.rst | 41 +- src/site/en/rst/exportDb.rst | 43 +-- src/site/en/rst/importData.rst | 418 ++++++++++----------- src/site/en/rst/importDb.rst | 20 +- src/site/en/rst/index.rst | 9 +- src/site/en/rst/install.rst.vm | 124 +++--- src/site/en/rst/usage.rst.vm | 133 +++---- 38 files changed, 725 insertions(+), 594 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 echobase. See http://git.codelutin.com/echobase.git commit 144b255feaddb1945aa341f90346df2f37989a11 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 08:29:55 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index d0c5649..98d78f0 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.13-SNAPSHOT</version> + <version>2.12</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index bde2a9a..f05bab2 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.13-SNAPSHOT</version> + <version>2.12</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 35f0e83..cc08b52 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.13-SNAPSHOT</version> + <version>2.12</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 2686bb2..b0a7e42 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.13-SNAPSHOT</version> + <version>2.12</version> <modules> <module>echobase-domain</module> -- 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 echobase. See http://git.codelutin.com/echobase.git commit 3ab50c60364c237168ad3cb40ea131ef95fbfd9a Merge: 144b255 f326335 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 08:29:55 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 echobase. See http://git.codelutin.com/echobase.git commit 8508aa64641d03e4aa5b825fb56a9acea7da1126 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 25 08:29:55 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 98d78f0..d0c5649 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12</version> + <version>2.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index f05bab2..bde2a9a 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12</version> + <version>2.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index cc08b52..35f0e83 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12</version> + <version>2.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index b0a7e42..2686bb2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.12</version> + <version>2.13-SNAPSHOT</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm