- Echobase-commits - mailman.cloud.codelutin.com

r711 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/entities echobase-domain/src/main/resources/i18n echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb
by tchemit＠users.forge.codelutin.com 25 Sep '12

25 Sep '12

Author: tchemit Date: 2012-09-25 12:15:57 +0200 (Tue, 25 Sep 2012) New Revision: 711 Url: http://forge.codelutin.com/repositories/revision/echobase/711 Log: change dashboard column names Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2012-09-25 10:15:57 UTC (rev 711) @@ -36,34 +36,44 @@ public enum ImportType implements I18nAble { /** Import a voyage with all his data. */ - VOYAGE(n_("echobase.common.importType.voyage")), + VOYAGE(n_("echobase.common.importType.voyage"), + n_("echobase.common.importType.voyage.short")), /** Import Voyage / Transit / Transect. */ - COMMON_ALL(n_("echobase.common.importType.commonDataAll")), + COMMON_ALL(n_("echobase.common.importType.commonDataAll"), + n_("echobase.common.importType.commonDataAll.short")), /** Import all common data from Transect to Operation. */ - COMMON_TRANSECT(n_("echobase.common.importType.commonDataTransect")), + COMMON_TRANSECT(n_("echobase.common.importType.commonDataTransect"), + n_("echobase.common.importType.commonDataTransect.short")), /** Import operations common data. */ - OPERATION(n_("echobase.common.importType.operation")), + OPERATION(n_("echobase.common.importType.operation"), + n_("echobase.common.importType.operation.short")), /** Import catches data (unsorted, total, but no individual ones). */ - CATCHES(n_("echobase.common.importType.catches")), + CATCHES(n_("echobase.common.importType.catches"), + n_("echobase.common.importType.catches.short")), /** Import accoustic data (Cells ESDU and Elementary). */ - ACOUSTIC(n_("echobase.common.importType.acoustic")), + ACOUSTIC(n_("echobase.common.importType.acoustic"), + n_("echobase.common.importType.acoustic.short")), /** Import results at voyage level. */ - RESULT_VOYAGE(n_("echobase.common.importType.resultsVoyage")), + RESULT_VOYAGE(n_("echobase.common.importType.resultsVoyage"), + n_("echobase.common.importType.resultsVoyage.short")), /** Import esdu results by echotype. */ - RESULT_ESDU(n_("echobase.common.importType.resultsEsdu")), + RESULT_ESDU(n_("echobase.common.importType.resultsEsdu"), + n_("echobase.common.importType.resultsEsdu.short")), /** Import cells Region. */ - RESULT_REGION(n_("echobase.common.importType.resultsRegion")), + RESULT_REGION(n_("echobase.common.importType.resultsRegion"), + n_("echobase.common.importType.resultsRegion.short")), /** Import cells Map. */ - RESULT_MAP(n_("echobase.common.importType.resultsMap")); + RESULT_MAP(n_("echobase.common.importType.resultsMap"), + n_("echobase.common.importType.resultsMap.short")); /** * All common import types. @@ -87,8 +97,11 @@ private final String i18nKey; - ImportType(String i18nKey) { + private final String shortI18nKey; + + ImportType(String i18nKey, String shortI18nKey) { this.i18nKey = i18nKey; + this.shortI18nKey = shortI18nKey; } @Override @@ -96,6 +109,10 @@ return i18nKey; } + public String getShortI18nKey() { + return shortI18nKey; + } + public static ImportType[] getCommonImportType() { return COMMON_IMPORT_TYPES; } Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-25 10:15:57 UTC (rev 711) @@ -1,15 +1,25 @@ echobase.common.driverType.h2=H2 Database echobase.common.driverType.postgres=Postgresql Database echobase.common.importType.acoustic=Acoustic data import +echobase.common.importType.acoustic.short=Acoustic echobase.common.importType.catches=Fishing data import +echobase.common.importType.catches.short=Fishing echobase.common.importType.commonDataAll=Voyage / Transit / Transects import +echobase.common.importType.commonDataAll.short=V/T/T echobase.common.importType.commonDataTransect=Transects import +echobase.common.importType.commonDataTransect.short=Transect echobase.common.importType.operation=Operations data import +echobase.common.importType.operation.short=Operation echobase.common.importType.resultsEsdu=Import the “ESDU” cells results +echobase.common.importType.resultsEsdu.short=R ESDU echobase.common.importType.resultsMap=Import the “map” cells results +echobase.common.importType.resultsMap.short=Map echobase.common.importType.resultsRegion=Import the “region” cells results +echobase.common.importType.resultsRegion.short=Region echobase.common.importType.resultsVoyage=Import the voyage-related results +echobase.common.importType.resultsVoyage.short=R Voyage echobase.common.importType.voyage=Voyage import +echobase.common.importType.voyage.short=Voyage echobase.config.csv.separator.description=Csv separator character echobase.config.data.directory.description=Path to application data echobase.config.documentationUrl.description=Where to find EchoBase online documentation Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-25 10:15:57 UTC (rev 711) @@ -1,15 +1,25 @@ echobase.common.driverType.h2=Base H2 echobase.common.driverType.postgres=Base Postgresql echobase.common.importType.acoustic=Import des données acoustiques +echobase.common.importType.acoustic.short=Acoustique echobase.common.importType.catches=Import des données de pêche +echobase.common.importType.catches.short=Pêche echobase.common.importType.commonDataAll=Import Voyage / Transit / Transects +echobase.common.importType.commonDataAll.short=V/T/T echobase.common.importType.commonDataTransect=Import Transects +echobase.common.importType.commonDataTransect.short=Transects echobase.common.importType.operation=Import des opérations +echobase.common.importType.operation.short=Opérations echobase.common.importType.resultsEsdu=Import des résultats des cellules de type "ESDU" +echobase.common.importType.resultsEsdu.short=R ESDU echobase.common.importType.resultsMap=Import des cellules de type Carte +echobase.common.importType.resultsMap.short=Carte echobase.common.importType.resultsRegion=Import des cellules de type Région +echobase.common.importType.resultsRegion.short=Région echobase.common.importType.resultsVoyage=Import des résultats du voyage +echobase.common.importType.resultsVoyage.short=R Voyage echobase.common.importType.voyage=Import Campagne +echobase.common.importType.voyage.short=Campagne echobase.config.csv.separator.description=Caractère séparateur pour les fichiers csv echobase.config.data.directory.description=Répertoire des données de l'application echobase.config.documentationUrl.description=Où trouver la documentation en ligne d'EchoBase Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2012-09-25 10:15:57 UTC (rev 711) @@ -23,10 +23,12 @@ * #L% */ +import com.google.common.collect.Lists; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import java.util.Map; +import java.io.Serializable; +import java.util.List; /** * DashBoard of existing voyages. @@ -38,16 +40,53 @@ private static final long serialVersionUID = 1L; - protected Map<String, String> importTypes; + protected List<ImportTypeEntry> importTypes; - public Map<String, String> getImportTypes() { + public List<ImportTypeEntry> getImportTypes() { return importTypes; } @Override public String execute() throws Exception { - importTypes = decorateEnums(ImportType.values()); + importTypes = Lists.newLinkedList(); + for (ImportType importType : ImportType.values()) { + ImportTypeEntry entry = new ImportTypeEntry( + importType.name(), + _(importType.getShortI18nKey()), + _(importType.getI18nKey()) + ); + importTypes.add(entry); + } return SUCCESS; } + + public static class ImportTypeEntry implements Serializable { + + private static final long serialVersionUID = 1L; + + protected String name; + + protected String label; + + protected String title; + + public ImportTypeEntry(String name, String label, String title) { + this.name = name; + this.label = label; + this.title = title; + } + + public String getName() { + return name; + } + + public String getLabel() { + return label; + } + + public String getTitle() { + return title; + } + } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-24 21:33:32 UTC (rev 710) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-25 10:15:57 UTC (rev 711) @@ -101,6 +101,10 @@ return result; } + function formatVoyageName(cellvalue, options, rowObject) { + return rowObject['id_lbl']; + } + jQuery(document).ready(function () { // display voyage infos @@ -118,12 +122,9 @@ }); $.addEvenAndOddClasses('voyages'); }); - - </script> <title><s:text name="echobase.title.dashboard"/></title> - <s:url id="loadUrl" action="getDashboardImportLogs" namespace="/workingDb" escapeAmp="false"/> <sjg:grid id="voyages" dataType="json" href="%{loadUrl}" gridModel="datas" @@ -137,12 +138,13 @@ onCompleteTopics="voyages-clearSelect,voyages-CompleteTopics"> <sjg:gridColumn name="id" title="id" hidden="true"/> - <sjg:gridColumn name="id_lbl" sortable="true" + <sjg:gridColumn name="name" sortable="true" formatter="formatVoyageName" title="%{getText('echobase.common.voyage')}"/> - <s:iterator value="%{importTypes.entrySet()}" var="entry"> - <sjg:gridColumn name="importType.%{#entry.key}" sortable="true" - title="%{#entry.value}" formatter="formatImportLogs"/> + <s:iterator value="%{importTypes}" var="entry"> + <sjg:gridColumn name="importType.%{#entry.name}" sortable="false" + title="%{#entry.label}" tooltip="%{#entry.title}" + formatter="formatImportLogs"/> </s:iterator> </sjg:grid> <br/> @@ -214,7 +216,7 @@ <s:label key='echobase.common.importText' value=''/> <div class="floatLeft"> - <pre id='importLogText' style="font-weight: bold;"></pre> + <pre id='importLogText' style="font-weight: bold;"></pre> </div> <br/>

1 0

r710 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: tchemit Date: 2012-09-24 23:33:32 +0200 (Mon, 24 Sep 2012) New Revision: 710 Url: http://forge.codelutin.com/repositories/revision/echobase/710 Log: fixes #1523: Lorsqu'une date n'existe pas, dbEditor utilise la date du jour Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-09-24 21:09:01 UTC (rev 709) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-09-24 21:33:32 UTC (rev 710) @@ -136,8 +136,13 @@ break; case 'Date': - // Update date - updateDate(value, editor); + if (!!value) { + // Update date (only if exists) + updateDate(value, editor); + } + // always set value to simple text editor otherwise it + // won't work anylonger after a blank previous value :( + editor.val(value); break; case 'FK': @@ -260,8 +265,6 @@ onCompleteTopics="datas-clearSelect,datas-CompleteTopics" navigatorSearchOptions="{multipleGroup:false,multipleSearch:true,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn']}"> - <%--navigatorSearchOptions="{multipleGroup:false,showQuery:true,multipleSearch:true,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn','in','ni']}"--%> - <sjg:gridColumn name="id" title="id" hidden="true" editable="true"/> <s:iterator value="columnMetas" var="meta" status="status"> @@ -329,8 +332,6 @@ <s:hidden key="entityType" label=''/> - <%--<s:hidden id="topiaId" name='topiaId' label=''/>--%> - <s:textfield id="topiaId" name='topiaId' readonly="true" label='%{getText("echobase.common.id")}' size="250"/>

1 0

r709 - in trunk: echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb src/site/rst
by tchemit＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: tchemit Date: 2012-09-24 23:09:01 +0200 (Mon, 24 Sep 2012) New Revision: 709 Url: http://forge.codelutin.com/repositories/revision/echobase/709 Log: fix exportDb + remove no more used doc Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp trunk/src/site/rst/exportDb.rst trunk/src/site/rst/importDb.rst Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-24 21:08:44 UTC (rev 708) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-24 21:09:01 UTC (rev 709) @@ -31,7 +31,7 @@ jQuery(document).ready(function () { function reload(value) { - if (this.value = "REFERENTIAL_AND_DATA") { + if (value == "REFERENTIAL_AND_DATA") { $('#extraInfos').show(); } else { $('#extraInfos').hide(); Modified: trunk/src/site/rst/exportDb.rst =================================================================== --- trunk/src/site/rst/exportDb.rst 2012-09-24 21:08:44 UTC (rev 708) +++ trunk/src/site/rst/exportDb.rst 2012-09-24 21:09:01 UTC (rev 709) @@ -62,19 +62,6 @@ Une fois l'export réalisé, le fichier sera téléchargeable. - -Export data ------------ - -Dans ce mode on exporte uniquement les données sélectionnées de la base de -travail. - -Il vous suffit de renseigner le nom du fichier d'export (l'extension -*.echobase*) sera automatiquement rajoutée, de sélectionner les données -à exporter puis de cliquer sur *Exporter*. - -Une fois l'export réalisé, le fichier sera téléchargeable. - Export All ---------- Modified: trunk/src/site/rst/importDb.rst =================================================================== --- trunk/src/site/rst/importDb.rst 2012-09-24 21:08:44 UTC (rev 708) +++ trunk/src/site/rst/importDb.rst 2012-09-24 21:09:01 UTC (rev 709) @@ -37,13 +37,6 @@ Il suffit de renseigner le fichier *.echobase* à importer et de lancer l'import. -Import Data ------------ - -Ce mode permet d'importer uniquement des données thématiques. - -Il suffit de renseigner le fichier *.echobase* à importer et de lancer l'import. - Import Free -----------

1 0

r708 - trunk/src/doc/reunions
by tchemit＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: tchemit Date: 2012-09-24 23:08:44 +0200 (Mon, 24 Sep 2012) New Revision: 708 Url: http://forge.codelutin.com/repositories/revision/echobase/708 Log: add cr renunion Added: trunk/src/doc/reunions/reunion-2012-09-24.txt Added: trunk/src/doc/reunions/reunion-2012-09-24.txt =================================================================== --- trunk/src/doc/reunions/reunion-2012-09-24.txt (rev 0) +++ trunk/src/doc/reunions/reunion-2012-09-24.txt 2012-09-24 21:08:44 UTC (rev 708) @@ -0,0 +1,40 @@ +======== +Echobase +======== + +Jeudi 20 septembre 2012 (Ifremer) + +Présents : Mathieu et Tony + +But +=== + +- Lissage des données +- Validation dela version 1.3 + +Echotype +======== + +- Les echotypes ne contiennent qu'une seule espèce. +- Les echotypes sont rattachés à plusieurs voyages alors que cela n'est plus possible. + +A faire +======= + +- Mathieu + - documentation + tests sur lissage des données +- Tony + - corriger les echotypes + - supprimer les modes (import/export) de données seules + - corriger le problème des dates (dans dbeditor) + - corriger le problème sur exporter les requetes (tout est en readonly) + - supprimer le mot import (dans les colonnes du tableau de bord) + - modifier le mode d'insertion de requete libre-office + - valider la version embarquée sans jdk mais only jvm + - faire doc d'installation + +Prochaine réunion +================= + +- Lundi 11 octbore 2012 à 10h00 + Property changes on: trunk/src/doc/reunions/reunion-2012-09-24.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r707 - trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new
by tchemit＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: tchemit Date: 2012-09-24 23:00:52 +0200 (Mon, 24 Sep 2012) New Revision: 707 Url: http://forge.codelutin.com/repositories/revision/echobase/707 Log: fixes #1524: Echotype mal renseign?\195?\169 dans les donn?\195?\169es l?\195?\169gendaires Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz =================================================================== (Binary files differ)

1 0

r706 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb echobase-services/src/main/java/fr/ifremer/echobase/services/importdb echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy echobase-services/src/main/resources/i18n echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/exp
by tchemit＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: tchemit Date: 2012-09-24 22:40:29 +0200 (Mon, 24 Sep 2012) New Revision: 706 Url: http://forge.codelutin.com/repositories/revision/echobase/706 Log: remove data only import/export Removed: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbMode.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbMode.java 2012-09-24 20:40:29 UTC (rev 706) @@ -38,9 +38,6 @@ /** Export only referential. */ REFERENTIAL(n_("echobase.common.exportDbMode.referential"), true, false), - /** Export only selected data. */ - DATA(n_("echobase.common.exportDbMode.data"), false, true), - /** Export selected data + referential. */ REFERENTIAL_AND_DATA(n_("echobase.common.exportDbMode.referentialAndData"), true, true), Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java 2012-09-24 20:40:29 UTC (rev 706) @@ -24,7 +24,6 @@ */ import fr.ifremer.echobase.I18nAble; -import fr.ifremer.echobase.entities.ImportType; import static org.nuiton.i18n.I18n.n_; @@ -39,9 +38,6 @@ /** Import only referential. */ REFERENTIAL(n_("echobase.common.importDbMode.referential")), - /** Import only data. */ - DATA(n_("echobase.common.importDbMode.data")), - /** Import what you want. */ FREE(n_("echobase.common.importDbMode.free")); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java 2012-09-24 20:40:29 UTC (rev 706) @@ -28,7 +28,6 @@ import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.importdata.ImportException; import fr.ifremer.echobase.services.importdb.strategy.AbstractImportDbStrategy; -import fr.ifremer.echobase.services.importdb.strategy.DataImportDbStrategy; import fr.ifremer.echobase.services.importdb.strategy.FreeImportDbStrategy; import fr.ifremer.echobase.services.importdb.strategy.ReferentialImportDbStrategy; import org.nuiton.topia.TopiaException; @@ -54,9 +53,6 @@ case REFERENTIAL: strategy = getService(ReferentialImportDbStrategy.class); break; - case DATA: - strategy = getService(DataImportDbStrategy.class); - break; case FREE: strategy = getService(FreeImportDbStrategy.class); break; Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java 2012-09-24 20:40:29 UTC (rev 706) @@ -1,127 +0,0 @@ -package fr.ifremer.echobase.services.importdb.strategy; - -/* - * #%L - * EchoBase :: Services - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * 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.collect.Lists; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.EntityModificationLog; -import fr.ifremer.echobase.entities.ImportLog; -import fr.ifremer.echobase.entities.ImportType; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.persistence.EchoBaseDbMeta; -import fr.ifremer.echobase.services.DecoratorService; -import fr.ifremer.echobase.services.importdata.ImportException; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.metadata.AssociationMeta; -import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.decorator.Decorator; - -import java.io.File; -import java.util.List; -import java.util.Map; -import java.util.zip.ZipEntry; - -/** - * Data only import db strategy. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.2 - */ -public class DataImportDbStrategy extends AbstractImportDbStrategy { - - @Override - protected void validateTableEntries(EchoBaseDbMeta dbMeta, - Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables) throws ImportException { - - // check that contains only referential entries - List<EchoBaseEntityEnum> badTableTypes = Lists.newArrayList(); - List<TableMeta<EchoBaseEntityEnum>> dataTables = dbMeta.getReferenceTables(); - for (TableMeta<EchoBaseEntityEnum> tableMetas : tables.keySet()) { - if (dataTables.contains(tableMetas)) { - badTableTypes.add(tableMetas.getSource()); - } - } - - if (!badTableTypes.isEmpty()) { - throw new ImportException( - "In data import, can not accept " + - "referential type, but found some referential files: " + badTableTypes); - } - } - - @Override - protected void validateAssociationEntries(EchoBaseDbMeta dbMeta, - Map<AssociationMeta<EchoBaseEntityEnum>, ZipEntry> associations) throws ImportException { - List<EchoBaseEntityEnum> badAssociationTypes = Lists.newArrayList(); - List<AssociationMeta<EchoBaseEntityEnum>> associationTables = dbMeta.getReferenceAssociations(); - for (AssociationMeta<EchoBaseEntityEnum> tableMetas : associations.keySet()) { - if (associationTables.contains(tableMetas)) { - badAssociationTypes.add(tableMetas.getSource()); - } - } - if (!badAssociationTypes.isEmpty()) { - throw new ImportException( - "In data import, can not accept " + - "referential type, but found some referential associations files: " + - badAssociationTypes); - } - } - - @Override - protected void createImportLogEntry(TopiaDAO<ImportLog> dao, - EchoBaseUser user, - File file, - Iterable<Voyage> importedVoyages) throws TopiaException { - - Decorator<Voyage> decorator = getService(DecoratorService.class).getDecorator(getLocale(), Voyage.class, null); - for (Voyage importedVoyage : importedVoyages) { - - // create a importLog entry - ImportLog importLog = dao.create( - ImportLog.PROPERTY_VOYAGE_ID, importedVoyage.getTopiaId(), - ImportLog.PROPERTY_IMPORT_TYPE, ImportType.VOYAGE, - ImportLog.PROPERTY_IMPORT_USER, user.getEmail(), - ImportLog.PROPERTY_IMPORT_DATE, newDate(), - ImportLog.PROPERTY_IMPORT_TEXT, "import voyage " + decorator.toString(importedVoyage) + " from file " + file.getName() - ); - importLog.addImportId(importedVoyage.getTopiaId()); - } - } - - @Override - protected void createLogBookEntry(TopiaDAO<EntityModificationLog> dao, - EchoBaseUser user, - File file, - Iterable<Voyage> importedVoyages) throws TopiaException { - dao.create( - EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import data only db", - EntityModificationLog.PROPERTY_ENTITY_ID, "Data only EchoBase db", - EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), - EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), - EntityModificationLog.PROPERTY_MODIFICATION_TEXT, "import db from file " + file.getName() - ); - } -} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java 2012-09-24 20:40:29 UTC (rev 706) @@ -79,7 +79,7 @@ ImportLog.PROPERTY_IMPORT_TYPE, ImportType.VOYAGE, ImportLog.PROPERTY_IMPORT_USER, user.getEmail(), ImportLog.PROPERTY_IMPORT_DATE, date, - ImportLog.PROPERTY_IMPORT_TEXT, "import voyage " + decorator.toString(importedVoyage) + " from file " + file.getName() + ImportLog.PROPERTY_IMPORT_TEXT, "Import voyage " + decorator.toString(importedVoyage) + " from file " + file.getName() ); importLog.addImportId(importedVoyage.getTopiaId()); } @@ -92,8 +92,8 @@ Iterable<Voyage> importedVoyages) throws TopiaException { dao.create( - EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import free db", - EntityModificationLog.PROPERTY_ENTITY_ID, "Free EchoBase db", + EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import db", + EntityModificationLog.PROPERTY_ENTITY_ID, "EchoBase (referential + data) db", EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), EntityModificationLog.PROPERTY_MODIFICATION_TEXT, "import db from file " + file.getName() Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-09-24 20:40:29 UTC (rev 706) @@ -12,12 +12,10 @@ echobase.common.esduBySpeciesAndAgeCategoryFile=Results per ESDU / species / age file echobase.common.esduBySpeciesAndSizeCategoryFile=Results per ESDU / species / size file echobase.common.exportDbMode.all=Export complete database -echobase.common.exportDbMode.data=Export only data echobase.common.exportDbMode.referential=Export only referential echobase.common.exportDbMode.referentialAndData=Export referential and some data echobase.common.gearMetadataFile=Gear metadata file echobase.common.importDbFile=Import file (.echobase) -echobase.common.importDbMode.data=Data import echobase.common.importDbMode.free=Free import echobase.common.importDbMode.referential=Referential import echobase.common.lengthAgeKeyFile=Size-age equations file Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-09-24 20:40:29 UTC (rev 706) @@ -12,12 +12,10 @@ echobase.common.esduBySpeciesAndAgeCategoryFile=Fichier de résultats par ESDU / espèce / âge echobase.common.esduBySpeciesAndSizeCategoryFile=Fichier de résultats par ESDU / espèce / taille echobase.common.exportDbMode.all=Exporter toute la base -echobase.common.exportDbMode.data=Exporter uniquement des données echobase.common.exportDbMode.referential=Exporter uniquement le référentiel echobase.common.exportDbMode.referentialAndData=Exporter le référentiel et des données echobase.common.gearMetadataFile=Fichier de méta-données d'engin echobase.common.importDbFile=Fichier d'import (.echobase) -echobase.common.importDbMode.data=Import Données echobase.common.importDbMode.free=Import libre echobase.common.importDbMode.referential=Import Référentiel echobase.common.lengthAgeKeyFile=Fichier des relations taille-âge Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java 2012-09-24 20:40:29 UTC (rev 706) @@ -226,37 +226,6 @@ } @Test - public void exportData() throws IOException, TopiaException { - - ExportDbService service = getService(ExportDbService.class); - - ExportDbConfiguration conf = new ExportDbConfiguration(); - - conf.setVoyageIds(new String[]{getVoyageId()}); - - File workingDirectory = new File(getTestDir(), "work-dir"); - FileUtil.createDirectoryIfNecessary(workingDirectory); - conf.setWorkingDirectory(workingDirectory); - conf.setFileName("echobase-data"); - conf.setComputeSteps(true); - conf.setExportDbMode(ExportDbMode.DATA); - service.doExport(conf); - File exportFile = conf.getExportFile(); - Assert.assertNotNull(exportFile); - Assert.assertTrue(exportFile.exists()); - - // check all tables (referential + data) where exported - ZipFile zipFile = new ZipFile(exportFile); - - Map<TableMeta<EchoBaseEntityEnum>, ZipEntry> tables = - TopiaCsvImports.discoverEntries( - "echobase/", getDbMeta().getAllTables(), - zipFile, Lists.<String>newArrayList()); - - checkAllTablesExported(zipFile, tables); - } - - @Test public void exportReferentialAndData() throws IOException { ExportDbService service = getService(ExportDbService.class); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-09-24 20:40:29 UTC (rev 706) @@ -68,11 +68,6 @@ model.getActionTime()); break; - case DATA: - message = _("echobase.importDb.dataResult", - model.getActionTime()); - - break; case FREE: message = _("echobase.importDb.freeResult", model.getActionTime()); Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-24 20:40:29 UTC (rev 706) @@ -221,7 +221,6 @@ echobase.error.workingDbConfiguration.url.already.exists=A configuration with same url already exists echobase.error.workingDbConfiguration.url.required=Mandatory jdbc url echobase.header.request.result=SQL query result -echobase.importDb.dataResult=Data db import was sucessful in %s. echobase.importDb.freeResult=Free db import was succesful in %s. echobase.importDb.referentialResult=Referential db import was succesul in %s. echobase.info.click.to.select=You can select value with a simple click then copy it (Ctrl-C) Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-24 20:40:29 UTC (rev 706) @@ -221,7 +221,6 @@ echobase.error.workingDbConfiguration.url.already.exists=Une configuration existe déjà avec cette url echobase.error.workingDbConfiguration.url.required=Url jdbc obligatoire echobase.header.request.result=Résultat de la requête SQL -echobase.importDb.dataResult=L'import de type données s'est déroulé avec succès en %s. echobase.importDb.freeResult=L'import de type libre s'est déroulé avec succès en %s. echobase.importDb.referentialResult=L'import de type référentiel s'est déroulé avec succès en %s. echobase.info.click.to.select=Vous pouvez sélectionner la valeur en un simple click puis la copier (Ctrl-C) Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-09-24 20:40:29 UTC (rev 706) @@ -31,8 +31,11 @@ jQuery(document).ready(function () { function reload(value) { - $('#extraInfos').hide(); - $('[class~="' + value + '"]').show(); + if (this.value = "REFERENTIAL_AND_DATA") { + $('#extraInfos').show(); + } else { + $('#extraInfos').hide(); + } } // to change form when mode is changed @@ -52,17 +55,15 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('exportDb.html', null)}" - target="doc"> + <s:a href="%{getDocumentation('exportDb.html', null)}" target="doc"> <s:text name="echobase.action.show.exportDb.documentation"/> </s:a> </div> <br/> <s:radio id='mode' key='model.exportDbMode' list="modes" - cssClass="cleanBoth" - label='%{getText("echobase.common.exportDbMode")}' - required="true" template="myradiomap"/> + cssClass="cleanBoth" required="true" template="myradiomap" + label='%{getText("echobase.common.exportDbMode")}'/> <div class="cleanBoth"></div> <br/> @@ -72,7 +73,7 @@ <div class="cleanBoth"></div> <br/> - <div id='extraInfos' class="DATA REFERENTIAL_AND_DATA"> + <div id='extraInfos'> <s:checkboxlist list="voyages" key="model.voyageIds" id='voyages' template="mycheckboxlist" label="%{getText('echobase.label.voyageToSelect')}"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-09-24 20:09:52 UTC (rev 705) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-09-24 20:40:29 UTC (rev 706) @@ -26,11 +26,6 @@ <title><s:text name="echobase.title.importDb"/></title> -<script type="text/javascript"> - -</script> - - <s:form namespace="/importDb" method="POST" enctype="multipart/form-data"> <fieldset> <legend> @@ -43,9 +38,9 @@ </s:a> </div> <br/> - <s:radio id='mode' key='model.importDbMode' list="modes" cssClass="cleanBoth" - label='%{getText("echobase.common.importDbMode")}' - required="true" template="myradiomap"/> + <s:radio id='mode' key='model.importDbMode' list="modes" + cssClass="cleanBoth" required="true" template="myradiomap" + label='%{getText("echobase.common.importDbMode")}'/> <div class="cleanBoth"></div> <br/> <s:file name="input" required="true" key="echobase.common.importDbFile"/>

1 0

r705 - trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io
by tchemit＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: tchemit Date: 2012-09-24 22:09:52 +0200 (Mon, 24 Sep 2012) New Revision: 705 Url: http://forge.codelutin.com/repositories/revision/echobase/705 Log: fix copy gz files Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2012-09-24 20:07:44 UTC (rev 704) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2012-09-24 20:09:52 UTC (rev 705) @@ -24,6 +24,7 @@ import com.google.common.base.Charsets; import com.google.common.base.Preconditions; +import com.google.common.io.Files; import fr.ifremer.echobase.EchoBaseTechnicalException; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; @@ -81,7 +82,25 @@ if (filesToMerge.size() == 1) { // simple copy - FileUtils.copyFile(filesToMerge.iterator().next(), destinationFile); + + File source = filesToMerge.iterator().next(); + if (source.getName().endsWith(".gz")) { + BufferedWriter writer = new BufferedWriter(Files.newWriter(destinationFile, Charsets.UTF_8)); + try { + BufferedReader reader = new BufferedReader(new InputStreamReader(new GZIPInputStream(new FileInputStream(source)), Charsets.UTF_8)); + try { + IOUtils.copy(reader, writer); + reader.close(); + } finally { + IOUtils.closeQuietly(reader); + } + writer.close(); + } finally { + IOUtils.closeQuietly(writer); + } + } else { + FileUtils.copyFile(source, destinationFile); + } } else { // must merge all files @@ -101,7 +120,7 @@ if (toMergeFile.getName().endsWith(".gz")) { reader = new BufferedReader(new InputStreamReader(new GZIPInputStream(new FileInputStream(toMergeFile)), Charsets.UTF_8)); } else { - reader = new BufferedReader(new InputStreamReader(new FileInputStream(toMergeFile), Charsets.UTF_8)); + reader = new BufferedReader(Files.newReader(toMergeFile, Charsets.UTF_8)); } try { // pass the first line (header)

1 0

r704 - in trunk/echobase-tools/src/test/echobase-2012-04-12/csv: association new
by tchemit＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: tchemit Date: 2012-09-24 22:07:44 +0200 (Mon, 24 Sep 2012) New Revision: 704 Url: http://forge.codelutin.com/repositories/revision/echobase/704 Log: refs #1436: Lissage des donn?\195?\169es anciennes (fix echotypes) Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Echotype_species.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Echotype_species.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz =================================================================== (Binary files differ)

1 0

r703 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions resources/i18n webapp/WEB-INF/includes
by tchemit＠users.forge.codelutin.com 23 Sep '12

23 Sep '12

Author: tchemit Date: 2012-09-23 15:51:55 +0200 (Sun, 23 Sep 2012) New Revision: 703 Url: http://forge.codelutin.com/repositories/revision/echobase/703 Log: fix i18n Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java 2012-09-23 12:33:53 UTC (rev 702) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java 2012-09-23 13:51:55 UTC (rev 703) @@ -37,7 +37,7 @@ public String execute() throws Exception { if (!isWorkingDbSelected()) { - addFlashMessage(_("echobase.label.noWorkingDbSelected")); + addFlashMessage(_("echobase.info.no.workingDb.selected")); } return SUCCESS; } Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-23 12:33:53 UTC (rev 702) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-23 13:51:55 UTC (rev 703) @@ -277,7 +277,6 @@ echobase.label.exportFileName=Name of export file echobase.label.importFile=File to export echobase.label.login=Connection -echobase.label.noWorkingDbSelected=No working database selected echobase.label.numberOfCreatedEntities=No. of fields created echobase.label.numberOfUpdatedEntities=No. of fields updated echobase.label.query.description=Description Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-23 12:33:53 UTC (rev 702) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-23 13:51:55 UTC (rev 703) @@ -221,7 +221,7 @@ echobase.error.workingDbConfiguration.url.already.exists=Une configuration existe déjà avec cette url echobase.error.workingDbConfiguration.url.required=Url jdbc obligatoire echobase.header.request.result=Résultat de la requête SQL -echobase.importDb.dataResult=L'import de type données s'est déroulé abec succès en %s. +echobase.importDb.dataResult=L'import de type données s'est déroulé avec succès en %s. echobase.importDb.freeResult=L'import de type libre s'est déroulé avec succès en %s. echobase.importDb.referentialResult=L'import de type référentiel s'est déroulé avec succès en %s. echobase.info.click.to.select=Vous pouvez sélectionner la valeur en un simple click puis la copier (Ctrl-C) @@ -246,7 +246,7 @@ echobase.info.no.sqlQuery.selected=Aucune requête d'export SQL sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée echobase.info.no.voyagee.found=Aucune campagne à exporter -echobase.info.no.workingDb.selected=Aucune base de travail de sélectionnée +echobase.info.no.workingDb.selected=Aucune base de travail sélectionnée echobase.info.no.workingDbConfiguration.saved=Aucune configuration de base de travail enregistrée echobase.info.no.workingDbConfiguration.selected=Sélectionner une configuration pour ensuite vous y connecter echobase.info.removeData.failed=La suppresion de l'import a échoué @@ -277,7 +277,6 @@ echobase.label.exportFileName=Nom du fichier d'export echobase.label.importFile=Fichier à importer echobase.label.login=Connexion -echobase.label.noWorkingDbSelected=Aucune base de travail sélectionnée echobase.label.numberOfCreatedEntities=Nombre de champs créés echobase.label.numberOfUpdatedEntities=Nombre de champs mis à jour echobase.label.query.description=Description Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-23 12:33:53 UTC (rev 702) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-23 13:51:55 UTC (rev 703) @@ -76,7 +76,7 @@ </s:a> </li> <li> - <s:text name="echobase.label.noWorkingDbSelected"/> + <s:text name="echobase.info.no.workingDb.selected"/> </li> </s:else> </ul>

1 0

r702 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors echobase-ui/src/main/resources echobase-ui/src/main/resources/config echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 23 Sep '12

23 Sep '12

Author: tchemit Date: 2012-09-23 14:33:53 +0200 (Sun, 23 Sep 2012) New Revision: 702 Url: http://forge.codelutin.com/repositories/revision/echobase/702 Log: - fix exception in remove data - add interceptor to check if working db is selected (otherwise redirect to home) Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml trunk/echobase-ui/src/main/resources/config/struts-importData.xml trunk/echobase-ui/src/main/resources/config/struts-importDb.xml trunk/echobase-ui/src/main/resources/config/struts-removeData.xml trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 12:33:53 UTC (rev 702) @@ -113,7 +113,7 @@ this.progressModel = progressModel; } - public abstract long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException; + public abstract long computeNbSteps(Voyage voyage, ImportLog importLog); protected abstract void removeImportData(Voyage voyage, String id) throws TopiaException; @@ -401,11 +401,15 @@ } - protected long countCategoryUsingEchotype(final Voyage voyage) throws TopiaException { + protected long countCategoryUsingEchotype(final Voyage voyage) { String hql = "SELECT COUNT(DISTINCT c) FROM VoyageImpl v, CategoryImpl c WHERE " + "v = :voyage AND c.echotype in elements(v.echotype)"; - long result = categoryDAO.countByQuery(hql, "voyage", voyage); - return result; + try { + long result = categoryDAO.countByQuery(hql, "voyage", voyage); + return result; + } catch (TopiaException e) { + throw new EchoBaseTechnicalException(e); + } } public void incrementOp(String message) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:33:53 UTC (rev 702) @@ -55,7 +55,7 @@ } @Override - public long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException { + public long computeNbSteps(Voyage voyage, ImportLog importLog) { long result = importLog.sizeImportId(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:33:53 UTC (rev 702) @@ -55,7 +55,7 @@ } @Override - public long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException { + public long computeNbSteps(Voyage voyage, ImportLog importLog) { long result = importLog.sizeImportId(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java 2012-09-23 12:33:53 UTC (rev 702) @@ -63,8 +63,8 @@ if (!check) { String redirectUrl = getRedirectUrl(); - if (log.isInfoEnabled()) { - log.info("Will redirect to " + redirectUrl); + if (log.isDebugEnabled()) { + log.debug("Will redirect to " + redirectUrl); } redirect(redirectUrl); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-09-23 12:33:53 UTC (rev 702) @@ -87,8 +87,10 @@ } return true; } - if (log.isInfoEnabled()) { - log.info("No user loggued!"); + } + if (!userLoggued) { + if (log.isDebugEnabled()) { + log.debug("User is not loggued, will redirect to home"); } } return userLoggued; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2012-09-23 12:33:53 UTC (rev 702) @@ -28,6 +28,8 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.ui.EchoBaseSession; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * To check if logged user is admin. @@ -39,6 +41,9 @@ private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(CheckUserIsAdmin.class); + @Override protected boolean doCheck(ActionInvocation invocation) { EchoBaseActionSupport action = (EchoBaseActionSupport) invocation.getAction(); @@ -48,6 +53,12 @@ EchoBaseUser user = echoBaseSession.getUser(); Preconditions.checkNotNull(user, "No user found is session"); - return user.isAdmin(); + boolean admin = user.isAdmin(); + if (!admin) { + if (log.isDebugEnabled()) { + log.debug("User is not admin, will redirect to home"); + } + } + return admin; } } Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java 2012-09-23 12:33:53 UTC (rev 702) @@ -0,0 +1,41 @@ +package fr.ifremer.echobase.ui.interceptors; + +import com.opensymphony.xwork2.ActionInvocation; +import fr.ifremer.echobase.ui.EchoBaseSession; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Checks that a working db was selected, otherwise redirect to home. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 + */ +public class CheckWorkingDbSelected extends AbstractCheckInterceptor { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(CheckLogguedInterceptor.class); + + @Override + protected boolean doCheck(ActionInvocation invocation) { + EchoBaseActionSupport action = (EchoBaseActionSupport) + invocation.getAction(); + + EchoBaseSession echoBaseSession = action.getEchoBaseSession(); + boolean dbSelected = echoBaseSession.isWorkingDbSelected(); + if (!dbSelected) { + action.addFlashMessage(l_(action.getLocale(), + "echobase.info.no.workingDb.selected")); + if (log.isDebugEnabled()) { + log.debug("No working db selected, will redirect to home"); + } + } + return dbSelected; + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -29,7 +29,7 @@ <struts> - <package name="dbeditor" extends="loggued" namespace="/dbeditor"> + <package name="dbeditor" extends="logguedAndWithDb" namespace="/dbeditor"> <result-types> <result-type name="redirectToDbEditor" @@ -44,7 +44,7 @@  <action name="dbeditor" method="input" class="fr.ifremer.echobase.ui.actions.dbeditor.LoadEntities"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> </action> Modified: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -29,13 +29,13 @@ <struts> - <package name="embeddedApplication" extends="loggued" + <package name="embeddedApplication" extends="logguedAndWithDb" namespace="/embeddedApplication">  <action name="configure" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Configure"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input"> /WEB-INF/jsp/embeddedApplication/configure.jsp </result> @@ -48,7 +48,7 @@  <action name="build" method="execute" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Build"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/embeddedApplication/progress.jsp</result> <result type="redirectAction"> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -28,7 +28,7 @@ <struts> - <package name="exportDb" extends="loggued" namespace="/exportDb"> + <package name="exportDb" extends="logguedAndWithDb" namespace="/exportDb">  <action name="configureInput" method="input" @@ -39,7 +39,7 @@  <action name="configure" method="execute" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/exportDb</param> @@ -50,7 +50,7 @@  <action name="export" method="execute" class="fr.ifremer.echobase.ui.actions.exportDb.Export"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/exportDb/progress.jsp</result> <result type="redirectAction"> @@ -68,7 +68,7 @@  <action name="download" class="fr.ifremer.echobase.ui.actions.exportDb.Download"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -29,7 +29,7 @@ <struts> - <package name="exportQuery" extends="loggued" namespace="/exportQuery"> + <package name="exportQuery" extends="logguedAndWithDb" namespace="/exportQuery"> <result-types> <result-type name="redirectExportQuery" @@ -48,9 +48,10 @@ <interceptors>  - <interceptor-stack name="paramsPrepareParamsStackLoggued"> + <interceptor-stack name="paramsPrepareParamsStackLogguedWithDb"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkWorkingDbSelected"/> <interceptor-ref name="paramsPrepareParamsStack"/> </interceptor-stack> </interceptors> @@ -58,7 +59,7 @@  <action name="manageExportQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result type="showList"/> </action> @@ -85,7 +86,7 @@  <action name="clone" method="cloneQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result name="input" type="showList"/> <result type="redirectExportQuery"/> </action> @@ -93,7 +94,7 @@  <action name="save" method="saveQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result name="input" type="showList"/> <result type="redirectExportQuery"/> </action> @@ -101,23 +102,22 @@  <action name="confirmDelete" method="confirmDeleteQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result>/WEB-INF/jsp/exportQuery/confirmDelete.jsp</result> </action>  <action name="delete" method="deleteQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result name="input" type="showList"/> <result type="redirectExportQuery"/> </action> -  <action name="downloadExportQueryResult" class="fr.ifremer.echobase.ui.actions.exportQuery.DownloadExportQueryResult"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -28,12 +28,12 @@ <struts> - <package name="importData" extends="loggued" namespace="/importData"> + <package name="importData" extends="logguedAndWithDb" namespace="/importData">  <action name="selectImportType" class="fr.ifremer.echobase.ui.actions.importData.SelectImportType"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importData/selectImportType.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> @@ -45,7 +45,7 @@  <action name="configure*-*" method="{2}" class="fr.ifremer.echobase.ui.actions.importData.Configure{1}Import"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importData/configure{1}Import.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> @@ -56,7 +56,7 @@  <action name="import*" method="execute" class="fr.ifremer.echobase.ui.actions.importData.Launch{1}Import"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/importData/progress{1}Import.jsp</result> <result type="redirectAction"> @@ -86,7 +86,7 @@  <action name="createMission" class="fr.ifremer.echobase.ui.actions.importData.CreateMission"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importData/createMission.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -28,7 +28,7 @@ <struts> - <package name="importDb" extends="loggued" namespace="/importDb"> + <package name="importDb" extends="logguedAndWithDb" namespace="/importDb">  <action name="configureInput" method="input" @@ -39,7 +39,7 @@  <action name="configure" method="execute" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/importDb</param> @@ -50,7 +50,7 @@  <action name="import" method="execute" class="fr.ifremer.echobase.ui.actions.importDb.Import"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/importDb/progress.jsp</result> <result type="redirectAction"> Modified: trunk/echobase-ui/src/main/resources/config/struts-removeData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-removeData.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-removeData.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -26,7 +26,7 @@ <struts> - <package name="removeData" extends="loggued" namespace="/removeData"> + <package name="removeData" extends="logguedAndWithDb" namespace="/removeData">  <action name="confirmDelete" @@ -41,7 +41,7 @@  <action name="delete" method="execute" class="fr.ifremer.echobase.ui.actions.removeData.Delete"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/removeData/deleteProgress.jsp</result> <result type="redirectAction"> Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -31,8 +31,6 @@ <package name="user" extends="loggued" namespace="/user"> - <default-interceptor-ref name="basicStackLoggued"/> -  <action name="login" class="fr.ifremer.echobase.ui.actions.user.Login" method="execute"> Modified: trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -47,6 +47,7 @@  <action name="information" class="fr.ifremer.echobase.ui.actions.workingDb.Information"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result>/WEB-INF/jsp/workingDb/information.jsp</result> </action> @@ -114,6 +115,7 @@  <action name="logs" class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result>/WEB-INF/jsp/workingDb/modifications.jsp</result> </action> @@ -130,12 +132,14 @@  <action name="getEntityModificationLogs" method="entityModificationLogs" class="fr.ifremer.echobase.ui.actions.dbeditor.GetEntities"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="jsonWithPager"/> </action>  <action name="getDashboardImportLogs" method="dashboardImportLogs" class="fr.ifremer.echobase.ui.actions.dbeditor.GetEntities"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="jsonWithPager"/> </action> @@ -143,18 +147,21 @@  <action name="getDashboardImportLog" method="execute" class="fr.ifremer.echobase.ui.actions.workingDb.GetImportLogDetail"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="json"/> </action>  <action name="getDashboardVoyage" method="execute" class="fr.ifremer.echobase.ui.actions.workingDb.GetVoyage"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="json"/> </action>  <action name="dashboard" method="execute" class="fr.ifremer.echobase.ui.actions.workingDb.DashBoard"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result>/WEB-INF/jsp/workingDb/dashboard.jsp</result> </action> </package> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-23 12:33:53 UTC (rev 702) @@ -246,6 +246,7 @@ echobase.info.no.sqlQuery.selected=No SQL query selected echobase.info.no.table.selected=No table selected echobase.info.no.voyagee.found=No survey selected +echobase.info.no.workingDb.selected=No working database selected echobase.info.no.workingDbConfiguration.saved=No working database configuration saved echobase.info.no.workingDbConfiguration.selected=Select a working database configuration and then connect echobase.info.removeData.failed=Import removal failed Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-23 12:33:53 UTC (rev 702) @@ -246,6 +246,7 @@ echobase.info.no.sqlQuery.selected=Aucune requête d'export SQL sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée echobase.info.no.voyagee.found=Aucune campagne à exporter +echobase.info.no.workingDb.selected=Aucune base de travail de sélectionnée echobase.info.no.workingDbConfiguration.saved=Aucune configuration de base de travail enregistrée echobase.info.no.workingDbConfiguration.selected=Sélectionner une configuration pour ensuite vous y connecter echobase.info.removeData.failed=La suppresion de l'import a échoué Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/struts.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -58,7 +58,8 @@ <param name="namespace">/</param> </result-type> <result-type name="json" class="org.apache.struts2.json.JSONResult"/> - <result-type name="jsonWithPager" class="org.apache.struts2.json.JSONResult"> + <result-type name="jsonWithPager" + class="org.apache.struts2.json.JSONResult"> <param name="includeProperties"> rows,page,total,records,datas,datas.*,sord,sidx,filters,searchField,searchString,searchOper </param> @@ -85,6 +86,11 @@ <param name="redirectAction">/home</param> </interceptor> + <interceptor name="checkWorkingDbSelected" + class="fr.ifremer.echobase.ui.interceptors.CheckWorkingDbSelected"> + <param name="redirectAction">/home</param> + </interceptor> + </interceptors>  @@ -123,12 +129,35 @@ <interceptor-ref name="defaultStack"/> </interceptor-stack> +  + <interceptor-stack name="basicStackLogguedWithdb"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkWorkingDbSelected"/> + <interceptor-ref name="basicStack"/> + </interceptor-stack> + +  + <interceptor-stack name="prepareParamsStackLogguedWithDb"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkWorkingDbSelected"/> + <interceptor-ref name="defaultStack"/> + </interceptor-stack> + </interceptors>  <default-interceptor-ref name="basicStackLoggued"/> </package> + + <package name="logguedAndWithDb" extends="loggued" abstract="true"> + +  + <default-interceptor-ref name="basicStackLogguedWithdb"/> + + </package> <package name="applicationDefault" extends="default" namespace="/"> <default-action-ref name="home"/>

1 0