[Echobase-commits] branch develop updated (c9c713b -> c22cec5)

30 Dec 2014

      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  c9c713b   fixes #6359: Utiliser coser 1.5
       new  55c6ad6   ajout de l'entite sur le modele
       new  e433083   ajout d'une method pour savoir si on est sur pg (pour les migrations)
       new  33d235e   normalisation des emplacements de fichiers de migration
       new  c846e80   ajout migration 2.7.2 + normalisation des autres scripts de migration
       new  c0a5ab3   on passe en jdk 7
       new  7db77e5   enregistrement des fichiers d'import
       new  7fb88d9   recuperer les fichiers d'import
       new  f5ec58a   pouvoir telecharger les fichier d'import sur l'ecran de tableau de bord
       new  c22cec5   fixes #6367

The 9 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 c22cec5955c5bf07c3962ad6ad333e776c72ff36
Merge: c9c713b f5ec58a
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Dec 30 12:31:03 2014 +0100

    fixes #6367

commit f5ec58a247b40d5663d52279869752c5946169b0
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Dec 30 12:30:42 2014 +0100

    pouvoir telecharger les fichier d'import sur l'ecran de tableau de bord

commit 7fb88d97c2340e35c0fb4b17ea8ac322fc475933
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Dec 30 12:30:15 2014 +0100

    recuperer les fichiers d'import

commit 7db77e56e18ed5bbe9664792a5e6b64e598b320f
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Dec 30 10:59:19 2014 +0100

    enregistrement des fichiers d'import

commit c0a5ab38471575cd0e1e33565f507b4da51ace15
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Dec 30 10:56:48 2014 +0100

    on passe en jdk 7

commit c846e804bec721237d35d828c22f2c7672c4b706
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Dec 30 09:59:10 2014 +0100

    ajout migration 2.7.2 + normalisation des autres scripts de migration

commit 33d235eeec69782e2f2ef04d248a8a09c116c35c
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Dec 30 09:58:35 2014 +0100

    normalisation des emplacements de fichiers de migration

commit e433083f291fcdf35a2a953366ba41e6feb975c8
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Dec 30 09:58:02 2014 +0100

    ajout d'une method pour savoir si on est sur pg (pour les migrations)

commit 55c6ad6a333df88a07924a4c1d2b783de116575a
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Dec 30 09:57:22 2014 +0100

    ajout de l'entite sur le modele

Summary of changes:
 .../entities/EchoBaseUserPersistenceContext.java   |   1 +
 .../EchoBaseUserTopiaPersistenceContext.java       |   8 ++
 .../internalDb/MigrationCallBackForVersion.java    |  14 +++
 .../workingDb/MigrationCallBackForVersion.java     |  39 +++++++++
 .../workingDb/MigrationCallBackForVersion2_2.java  |   3 +-
 .../MigrationCallBackForVersion2_5_1.java          |   9 +-
 .../workingDb/MigrationCallBackForVersion2_6.java  |   5 +-
 .../MigrationCallBackForVersion2_6_1.java          |   5 +-
 .../MigrationCallBackForVersion2_7_2.java          |  13 ++-
 .../2.5.1-0-postgis-structure.sql}                 |   0
 .../2.5.1-1-postgis-view.sql}                      |   0
 .../2.6-0-postgis-view.sql}                        |   0
 .../2.6.1-0-postgis-structure.sql}                 |   0
 .../2.7.2-0-postgis-view.sql}                      |   0
 .../workingDb/h2/2.7.2-1-add-importFile-entity.sql |   3 +
 .../workingDb/pg/2.7.2-1-add-importFile-entity.sql |   3 +
 echobase-domain/src/main/xmi/echobase.zargo        | Bin 89097 -> 89705 bytes
 .../services/service/UserDbPersistenceService.java |  67 ++++++++++++++-
 .../importdata/AbstractImportDataService.java      |  51 ++++++++---
 .../ui/actions/workingDb/DownloadImportFile.java   |  95 +++++++++++++++++++++
 .../ui/actions/workingDb/GetImportLogDetail.java   |   9 ++
 .../src/main/resources/config/struts-workingDb.xml |  12 +++
 .../resources/i18n/echobase-ui_en_GB.properties    |   2 +
 .../resources/i18n/echobase-ui_fr_FR.properties    |   2 +
 .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp     |  53 ++++++++++--
 echobase-ui/src/main/webapp/js/test.js             |  65 --------------
 pom.xml                                            |   9 ++
 27 files changed, 362 insertions(+), 106 deletions(-)
 rename echobase-domain/src/main/resources/migration/{postgis-structure-2.5.1.sql => workingDb/2.5.1-0-postgis-structure.sql} (100%)
 rename echobase-domain/src/main/resources/migration/{postgis-view-2.5.1.sql => workingDb/2.5.1-1-postgis-view.sql} (100%)
 rename echobase-domain/src/main/resources/migration/{postgis-view-2.6.sql => workingDb/2.6-0-postgis-view.sql} (100%)
 rename echobase-domain/src/main/resources/migration/{postgis-structure-2.6.1.sql => workingDb/2.6.1-0-postgis-structure.sql} (100%)
 rename echobase-domain/src/main/resources/migration/{postgis-view-2.7.2.sql => workingDb/2.7.2-0-postgis-view.sql} (100%)
 create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql
 create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql
 create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadImportFile.java
 delete mode 100644 echobase-ui/src/main/webapp/js/test.js

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

[Echobase-commits] branch develop updated (c9c713b -> c22cec5)

codelutin.com scm