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

r109 - trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta
by tchemit＠users.forge.codelutin.com 23 Nov '11

23 Nov '11

Author: tchemit Date: 2011-11-23 18:50:27 +0100 (Wed, 23 Nov 2011) New Revision: 109 Url: http://forge.codelutin.com/repositories/revision/echobase/109 Log: use entityEnum instead of name Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java 2011-11-23 10:34:23 UTC (rev 108) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java 2011-11-23 17:50:27 UTC (rev 109) @@ -66,18 +66,6 @@ return tables; } - public TableMeta getTable(String tableName) { - Preconditions.checkNotNull(tableName); - TableMeta result = null; - for (TableMeta tableMeta : getTables()) { - if (tableName.equals(tableMeta.getName())) { - result = tableMeta; - break; - } - } - return result; - } - public TableMeta getTable(EchoBaseEntityEnum tableName) { Preconditions.checkNotNull(tableName); TableMeta result = null; Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2011-11-23 10:34:23 UTC (rev 108) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2011-11-23 17:50:27 UTC (rev 109) @@ -29,6 +29,7 @@ import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.EntityOperator; +import org.nuiton.util.ObjectUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; @@ -47,8 +48,6 @@ private static final long serialVersionUID = 1L; - protected final String name; - protected final String i18nKey; protected final EntityOperator<?> operator; @@ -62,7 +61,6 @@ public TableMeta(EchoBaseEntityEnum entityEnum) { Preconditions.checkNotNull(entityEnum); this.entityEnum = entityEnum; - name = entityEnum.getImplementationFQN(); Class<? extends TopiaEntity> contract = entityEnum.getContract(); i18nKey = "echobase.common." + Introspector.decapitalize(contract.getSimpleName()); @@ -70,7 +68,7 @@ } public String getName() { - return name; + return entityEnum.name(); } public EchoBaseEntityEnum getEntityEnum() { @@ -140,6 +138,10 @@ return getColumns().iterator(); } + public TopiaEntity newEntity() { + return ObjectUtil.newInstance(entityEnum.getImplementation()); + } + protected static <E extends TopiaEntity> Binder<E, E> newbinder(TableMeta meta) { BinderModelBuilder<E, E> binderModelBuilder = (BinderModelBuilder<E, E>) BinderModelBuilder.newEmptyBuilder(meta.getEntityType());

1 0

r108 - trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta
by tchemit＠users.forge.codelutin.com 23 Nov '11

23 Nov '11

Author: tchemit Date: 2011-11-23 11:34:23 +0100 (Wed, 23 Nov 2011) New Revision: 108 Url: http://forge.codelutin.com/repositories/revision/echobase/108 Log: add binder facility inside the TableMeta object Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2011-11-22 11:33:08 UTC (rev 107) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2011-11-23 10:34:23 UTC (rev 108) @@ -29,6 +29,8 @@ import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.EntityOperator; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderModelBuilder; import java.beans.Introspector; import java.io.Serializable; @@ -55,6 +57,8 @@ protected List<ColumnMeta> columns; + protected Binder<TopiaEntity, TopiaEntity> binder; + public TableMeta(EchoBaseEntityEnum entityEnum) { Preconditions.checkNotNull(entityEnum); this.entityEnum = entityEnum; @@ -127,8 +131,31 @@ return columns; } + public void copy(TopiaEntity source, TopiaEntity target) { + getBinder().copy(source, target); + } + @Override public Iterator<ColumnMeta> iterator() { return getColumns().iterator(); } + + protected static <E extends TopiaEntity> Binder<E, E> newbinder(TableMeta meta) { + BinderModelBuilder<E, E> binderModelBuilder = + (BinderModelBuilder<E, E>) BinderModelBuilder.newEmptyBuilder(meta.getEntityType()); + for (ColumnMeta columnMeta : meta) { + binderModelBuilder.addSimpleProperties( + columnMeta.getName() + ); + } + Binder<E, E> binder = binderModelBuilder.toBinder(); + return binder; + } + + protected Binder<TopiaEntity, TopiaEntity> getBinder() { + if (binder == null) { + binder = newbinder(this); + } + return binder; + } }

1 0

r107 - in trunk/echobase-services/src/main: java/fr/ifremer/echobase/services resources resources/embedded
by sletellier＠users.forge.codelutin.com 22 Nov '11

22 Nov '11

Author: sletellier Date: 2011-11-22 12:33:08 +0100 (Tue, 22 Nov 2011) New Revision: 107 Url: http://forge.codelutin.com/repositories/revision/echobase/107 Log: Move embedded configuration to embedded directory Added: trunk/echobase-services/src/main/resources/embedded/ trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties Removed: trunk/echobase-services/src/main/resources/echobase-embedded.properties Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-22 11:32:34 UTC (rev 106) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-22 11:33:08 UTC (rev 107) @@ -114,7 +114,7 @@ log.info("Copy configuration to " + configurationfile); } InputStream configInputStream = - getClass().getResourceAsStream("/echobase-embedded.properties"); + getClass().getResourceAsStream("/embedded/echobase-embedded.properties"); OutputStream configOutputStream = new FileOutputStream(configurationfile); try { IOUtils.copy(configInputStream, configOutputStream); Deleted: trunk/echobase-services/src/main/resources/echobase-embedded.properties =================================================================== --- trunk/echobase-services/src/main/resources/echobase-embedded.properties 2011-11-22 11:32:34 UTC (rev 106) +++ trunk/echobase-services/src/main/resources/echobase-embedded.properties 2011-11-22 11:33:08 UTC (rev 107) @@ -1,29 +0,0 @@ -### -# #%L -# EchoBase :: Services -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2011 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% -### - -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.username=sa -hibernate.connection.password=sa -hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:./db/echobase Copied: trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties (from rev 104, trunk/echobase-services/src/main/resources/echobase-embedded.properties) =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties (rev 0) +++ trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties 2011-11-22 11:33:08 UTC (rev 107) @@ -0,0 +1,29 @@ +### +# #%L +# EchoBase :: Services +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2011 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% +### + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:file:./db/echobase Property changes on: trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r106 - in trunk/src/site: . resources rst
by sletellier＠users.forge.codelutin.com 22 Nov '11

22 Nov '11

Author: sletellier Date: 2011-11-22 12:32:34 +0100 (Tue, 22 Nov 2011) New Revision: 106 Url: http://forge.codelutin.com/repositories/revision/echobase/106 Log: - Update server install documentation Added: trunk/src/site/resources/ trunk/src/site/resources/echobase.properties trunk/src/site/rst/install.rst trunk/src/site/rst/todo.rst Removed: trunk/src/site/rst/Todo.rst Modified: trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml Added: trunk/src/site/resources/echobase.properties =================================================================== --- trunk/src/site/resources/echobase.properties (rev 0) +++ trunk/src/site/resources/echobase.properties 2011-11-22 11:32:34 UTC (rev 106) @@ -0,0 +1,28 @@ +### +# #%L +# EchoBase +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2011 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% +### +hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.connection.driver_class=org.postgresql.Driver +hibernate.connection.url=jdbc:postgresql://localhost/echobase +hibernate.connection.username=echobase +hibernate.connection.password=echobase Deleted: trunk/src/site/rst/Todo.rst =================================================================== --- trunk/src/site/rst/Todo.rst 2011-11-22 09:46:56 UTC (rev 105) +++ trunk/src/site/rst/Todo.rst 2011-11-22 11:32:34 UTC (rev 106) @@ -1,23 +0,0 @@ -.. - -.. * #%L -.. * EchoBase -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2011 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% -.. - Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2011-11-22 09:46:56 UTC (rev 105) +++ trunk/src/site/rst/index.rst 2011-11-22 11:32:34 UTC (rev 106) @@ -21,11 +21,11 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - -== -Baracouda -== +======== +Echobase +======== -:Author: Tony Chemit <chemit(a)codelutin.com> +:Authors: Tony Chemit <chemit(a)codelutin.com>, Letellier Sylvain <letellier(a)codelutin.com> .. contents:: Table des matières :depth: 2 @@ -34,7 +34,6 @@ :start: 1 :depth: 2 - Présentation ------------ @@ -43,4 +42,4 @@ Les documents ------------- -TODO \ No newline at end of file +TODO Added: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst (rev 0) +++ trunk/src/site/rst/install.rst 2011-11-22 11:32:34 UTC (rev 106) @@ -0,0 +1,74 @@ +.. - +.. * #%L +.. * EchoBase +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 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% +.. - +======== +Echobase +======== + +:Authors: Tony Chemit <chemit(a)codelutin.com>, Letellier Sylvain <letellier(a)codelutin.com> + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +Première utilisation +-------------------- + +Un utilisateur par défaut est crée si la base est vide (première utilisation):: + + login : admin + mot de passe : admin + +Pour des raison de sécurité, il est conseillé de créer un nouvelle admin via l'interface de gestion des utilisateurs. + +Configuration d'Echobase +------------------------ + +Il faut éditer le fichier + +Voici les configurations par défaut:: + + data.directory=/var/local/echobase # Repertoire de l'application + war.directory=${data.directory}/war # Répertoire où est stoqué le war + war.location=${war.directory}/echobase-ui-${project.version}.war # Chemin complêt d'accès au war + +Vous pouvez surcharger toute les propriétés ci-dessus, dans la plupart des cas, seul la modification de data.directory est nécessaire. +Pour ce faire, il suffit de créer le fichier /etc/echobase.properties et d'y ajouter la ligne ci-dessus modifiée. + +Installation Postgres +--------------------- + +Création de l'utilisateur Postgres:: + + createuser -P echobase + +Création de la base de donnée "echobase":: + + createdb -E utf8 echobase -O echobase + +Il faut positionner le fichier de configuration echobase.properties_ dans /etc et remplacer le mot de passe (hibernate.connection.password) par celui rentré lors de la création de l'utilisateur Postgres. + +.. _echobase.properties: echobase.properties \ No newline at end of file Copied: trunk/src/site/rst/todo.rst (from rev 104, trunk/src/site/rst/Todo.rst) =================================================================== --- trunk/src/site/rst/todo.rst (rev 0) +++ trunk/src/site/rst/todo.rst 2011-11-22 11:32:34 UTC (rev 106) @@ -0,0 +1,40 @@ +.. - +.. * #%L +.. * EchoBase +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 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% +.. - +======== +Echobase +======== + +:Authors: Tony Chemit <chemit(a)codelutin.com>, Letellier Sylvain <letellier(a)codelutin.com> + +.. contents:: Table des matières + :depth: 2 + +.. sectnum:: + :start: 1 + :depth: 2 + +TODO +==== + +- Completer la documentation \ No newline at end of file Property changes on: trunk/src/site/rst/todo.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-11-22 09:46:56 UTC (rev 105) +++ trunk/src/site/site_fr.xml 2011-11-22 11:32:34 UTC (rev 106) @@ -23,8 +23,6 @@ #L% --> - - <project name="${project.name}"> <poweredBy> @@ -56,17 +54,19 @@ <breadcrumbs> <item name="${project.name}" - href="http://maven-site.forge.codelutin.com/baracouda/index.html"/> + href="http://maven-site.forge.codelutin.com/echobase/index.html"/> </breadcrumbs> <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Installation" href="install.html"/> <item name="Téléchargement" - href="http://forge.codelutin.com/projects/baracouda/files"/> + href="http://forge.codelutin.com/projects/echobase/files"/> <item name="Roadmap" - href="http://forge.codelutin.com/projects/baracouda/roadmap"/> - <item name="Historique des versions" href="changes-report.html"/> + href="http://forge.codelutin.com/projects/echobase/roadmap"/> + +  +  </menu> <!--menu name="Modélisation">

1 0

r105 - in trunk/echobase-ui/src/main: resources/i18n webapp/WEB-INF/jsp/dbeditor
by sletellier＠users.forge.codelutin.com 22 Nov '11

22 Nov '11

Author: sletellier Date: 2011-11-22 10:46:56 +0100 (Tue, 22 Nov 2011) New Revision: 105 Url: http://forge.codelutin.com/repositories/revision/echobase/105 Log: Fix time edition Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 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 2011-11-21 16:12:09 UTC (rev 104) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-22 09:46:56 UTC (rev 105) @@ -1,6 +1,5 @@ echobase.action.applySqlQuery=Appliquer la requête echobase.action.backToUserList=Retour à la liste des utilisateurs -echobase.action.reset=Annuler echobase.action.cloneSqlQuery=Cloner la requête echobase.action.create=Créer echobase.action.createEmbeddedApplication=Créer l'application @@ -15,6 +14,7 @@ echobase.action.login=Connection echobase.action.logout=Déconnexion echobase.action.reloadSqlQuery=Recharger +echobase.action.reset=Annuler echobase.action.return=Retour echobase.action.save=Sauvegarder echobase.action.saveSqlQuery=Enregistrer la requête 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 2011-11-21 16:12:09 UTC (rev 104) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-22 09:46:56 UTC (rev 105) @@ -146,27 +146,39 @@ function updateDate(value, editor) { // parse date formated like : dd/MM/yyyy HH:mm:ss + var date = parseDate(value); + + // get timePicker instance + var inst = $.datepicker._getInst(editor[0]); + + // set date + $.datepicker._setDate(inst, date); + + // set time + $.datepicker._setTime(inst, date); + } + + function parseDate(value) { + + // parse date formated like : dd/MM/yyyy HH:mm:ss var dateString = value.substring(0, 10); var dateSplited = dateString.split("/"); var hourString = value.substring(11, 19); var hourSplited = hourString.split(":"); - var options_timepicker = {}; - options_timepicker.day = dateSplited[0]; - options_timepicker.month = dateSplited[1]; - options_timepicker.year = dateSplited[2]; - options_timepicker.hour = hourSplited[0]; - options_timepicker.minute = hourSplited[1]; - options_timepicker.second = hourSplited[2]; - options_timepicker.showOn = "both"; - options_timepicker.buttonImage = "/echobase/struts/js/calendar.gif"; - options_timepicker.timepicker = true; - options_timepicker.jqueryaction = "datepicker"; - options_timepicker.id = editor.id; - options_timepicker.name = editor.id; + var day = parseInt(dateSplited[0]); - jQuery.struts2_jquery.bind(editor, options_timepicker); + // FIXME sletellier 20111122 : currently, one month more are displayed.... + var month = parseInt(dateSplited[1]) - 1; + var year = parseInt(dateSplited[2]); + var hour = parseInt(hourSplited[0]); + var minute = parseInt(hourSplited[1]); + var second = parseInt(hourSplited[2]); + + // update date + // TODO sletellier 20111122 : edit milliseconds ? + return new Date(year, month, day, hour, minute, second, 0); } </script> @@ -307,6 +319,8 @@ <sj:datepicker id="%{#meta.name}" name="%{#meta.name}" label="%{getText(#meta.i18nKey)}" + value="%{new java.util.Date()}" + displayFormat="dd/mm/yy" timepicker="true" timepickerShowSecond="true" timepickerFormat="hh:mm:ss"/>

1 0

r104 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor echobase-ui/src/main/webapp/WEB-INF/jsp/export echobase-ui/src/main/webapp/WEB-INF/jsp/import echobase-ui/src/main/webapp/WEB-INF/jsp/user
by sletellier＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: sletellier Date: 2011-11-21 17:12:09 +0100 (Mon, 21 Nov 2011) New Revision: 104 Url: http://forge.codelutin.com/repositories/revision/echobase/104 Log: - Clean all traduction - Add autoLogin constant in Config Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/modifImportResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/createEmbeddedApplication.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importProgress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-21 16:12:09 UTC (rev 104) @@ -55,6 +55,8 @@ public static final String OPTION_UPDATE_SCHEMA = "updateSchema"; + public static final String OPTION_AUTO_LOGIN = "autoLogin"; + /** Delegate application config object containing configuration. */ protected ApplicationConfig applicationConfig; 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 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2011-11-21 16:12:09 UTC (rev 104) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.ui.interceptors; import com.opensymphony.xwork2.ActionInvocation; +import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.ui.EchoBaseSession; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import fr.ifremer.echobase.ui.actions.user.LoginAction; @@ -63,7 +64,9 @@ if (!userLoggued) { boolean autoLogin = - EchoBaseActionSupport.getEchoBaseApplicationContext().getConfiguration().getOptionAsBoolean("autoLogin"); + EchoBaseActionSupport.getEchoBaseApplicationContext() + .getConfiguration() + .getOptionAsBoolean(EchoBaseConfiguration.OPTION_AUTO_LOGIN); if (autoLogin) { // by-pass login 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 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-21 16:12:09 UTC (rev 104) @@ -1,5 +1,6 @@ echobase.action.applySqlQuery=Appliquer la requête echobase.action.backToUserList=Retour à la liste des utilisateurs +echobase.action.reset=Annuler echobase.action.cloneSqlQuery=Cloner la requête echobase.action.create=Créer echobase.action.createEmbeddedApplication=Créer l'application @@ -14,65 +15,69 @@ echobase.action.login=Connection echobase.action.logout=Déconnexion echobase.action.reloadSqlQuery=Recharger +echobase.action.return=Retour echobase.action.save=Sauvegarder echobase.action.saveSqlQuery=Enregistrer la requête echobase.common.admin=Administrateur echobase.common.comment=Commentaire echobase.common.email=Email -echobase.common.embeddedApplicationFileName=Nom de l'archive à télécharger -echobase.common.embeddedWarFileName=Nom du war à utiliser -echobase.common.exportFileName=Nom du fichier d'export -echobase.common.import=Import configuration -echobase.common.importFile=Fichier à importer echobase.common.jdbcLogin=Login de connexion echobase.common.jdbcPassword=Mot de passe echobase.common.jdbcUrl=Url de connexion echobase.common.password=Mot de passe -echobase.common.query.description=Description -echobase.common.query.name=Nom -echobase.common.request.result=Résultat de la requête sql -echobase.common.reset=Annuler -echobase.common.return=Retour -echobase.common.sqlQueries=Requêtes enregistrées -echobase.common.tableName=Nom de la table echobase.common.user=Utilisateur echobase.common.voyage=Voyage -echobase.common.voyagesToSelect=Voyage à exporter -echobase.dbEditor.propertyDiffsResult=Nombres d'entrées modifiés \: %s -echobase.dbeditor.edit=Edition de '%s' -echobase.embeddedApplication.configuration=Configuration de l'application embarquée echobase.error.bad.password=Mot de passe incorrrect echobase.error.email.already.used= +echobase.error.export.description.requiredstring=La description de l'export est obligatoire +echobase.error.export.name.requiredstring=Le nom de l'export est obligatoire +echobase.error.export.sqlQuery.requiredstring=La requête de l'export est obligatoire +echobase.error.export.sqlQuery.wrongformat=La requêtes n'est pas valide echobase.error.fileDontExist= echobase.error.fileNotFound= +echobase.error.import.selectedVoyageOrAccessImport.required=Merci de selectionner un voyage ou un import access echobase.error.importArgument= echobase.error.importFile.required=Fichier d'import obligatoire +echobase.error.login.password.requiredstring=Le mot de passe est obligatoire echobase.error.login.unknown=Utilisateur inconnu +echobase.error.login.wrongLogin=Le login est déjà utilisé echobase.error.required.email=L'email est obligatoire echobase.error.required.password=Le mot de passe est obligatoire echobase.error.warlocation.notFound=L'application n'a pas été trouvé à l'emplacement suivant %s -echobase.export.queryDescription=Description -echobase.export.queryName=Nom -echobase.export.querySql=SQL -echobase.importFile.access=Base access -echobase.importFile.accoustique=Fichier accoustique -echobase.importFile.events=Fichier evenements -echobase.importFile.lectureAgeGen=Fichier lecture age -echobase.importFile.pecherie=Fichier pecherie -echobase.importFile.typeEchoSpecies=Fichier espèces +echobase.header.request.result=Résultat de la requête sql +echobase.header.user.gridTitle=Liste des utilisateurs +echobase.header.voyageSelect=Selectionnez un voyage +echobase.info.dbeditor.propertyDiffsResult=Nombres d'entrées modifiés \: %s echobase.info.no.sqlQuery.saved=Aucune requête d'export sql enregistré 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.label.admin.user.create=Création d'un utilisateur -echobase.label.admin.user.delete=Suppression d'un utilisateur -echobase.label.admin.user.edit=Edition d'un utilisateur +echobase.label.embeddedApplicationFileName=Nom de l'archive à télécharger +echobase.label.embeddedWarFileName=Nom du war à utiliser +echobase.label.exportFileName=Nom du fichier d'export +echobase.label.import.access=Base access +echobase.label.import.accoustique=Fichier accoustique +echobase.label.import.events=Fichier evenements +echobase.label.import.lectureAgeGen=Fichier lecture age +echobase.label.import.pecherie=Fichier pecherie +echobase.label.import.typeEchoSpecies=Fichier espèces +echobase.label.importFile=Fichier à importer echobase.label.info.changePassword=Changement du mot de passe echobase.label.language=Language echobase.label.locale.english=Anglais echobase.label.locale.french=Français echobase.label.login=Connexion +echobase.label.query.description=Description +echobase.label.query.name=Nom +echobase.label.query.sql=SQL +echobase.label.sqlQueries=Requêtes enregistrées +echobase.label.tableName=Nom de la table echobase.label.user.login=Utilisateur \: %s -echobase.label.welcome=Bienvenue dans EchoBase +echobase.label.voyageToSelect=Voyage à exporter +echobase.legend.dbeditor.edit=Edition de '%s' +echobase.legend.embeddedApplication.configuration=Configuration de l'application embarquée +echobase.legend.import=Import configuration +echobase.legend.sqlQuery.configuration=Configuration de la requête +echobase.legend.sqlQuery.result=Résultats de la requête echobase.menu.connectToDbInformations=Se connecter à la base echobase.menu.createEmbeddedApplication=Créer une application embarquée echobase.menu.dbeditor=Modifier les données @@ -84,9 +89,10 @@ echobase.message.modified.property=Propriété '%s', ancienne valeur \: %s, nouvelle valeur \: %s echobase.message.no.row.selected=Aucune donnée sélectionnée echobase.message.noEntrySelection=Aucune entrée sélectionnée -echobase.msg.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'import. -echobase.sqlQuery.configuration=Configuration de la requête -echobase.sqlQuery.result=Résultats de la requête +echobase.message.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'import. +echobase.title.admin.user.create=Création d'un utilisateur +echobase.title.admin.user.delete=Suppression d'un utilisateur +echobase.title.admin.user.edit=Edition d'un utilisateur echobase.title.connectToDbInformations=Se connecter à la base de données echobase.title.connectionToDb.detail=Détail de la connection à la base de données echobase.title.createEmbeddedApplication=Création de l'application embarquée @@ -101,12 +107,4 @@ echobase.title.login=Connexion echobase.title.modification.detail=Détail de la modification echobase.title.users=Adminitration des utilisateurs -echobase.user.gridTitle=Liste des utilisateurs -echobase.validation.export.description.requiredstring=La description de l'export est obligatoire -echobase.validation.export.name.requiredstring=Le nom de l'export est obligatoire -echobase.validation.export.sqlQuery.requiredstring=La requête de l'export est obligatoire -echobase.validation.export.sqlQuery.wrongformat=La requêtes n'est pas valide -echobase.validation.import.selectedVoyageOrAccessImport.required=Merci de selectionner un voyage ou un import access -echobase.validation.login.password.requiredstring=Le mot de passe est obligatoire -echobase.validation.login.wrongLogin=Le login est déjà utilisé -echobase.voyage.selectHeader=Selectionnez un voyage +echobase.title.welcome=Bienvenue dans EchoBase 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 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-21 16:12:09 UTC (rev 104) @@ -170,7 +170,7 @@ } </script> -<s:select key="tableName" label='%{getText("echobase.common.tableName")}' +<s:select key="tableName" label='%{getText("echobase.label.tableName")}' list="tableNames" headerKey="" headerValue=""/> <br class="clearBoth"/> @@ -189,7 +189,7 @@ <s:hidden key="tableName" label=''/> <s:file key="importFile" required="true" - label="%{getText('echobase.common.importFile')}"/> + label="%{getText('echobase.label.importFile')}"/> <br/> <s:submit key="echobase.action.importTable" action="doImport" align="right"/> @@ -198,7 +198,7 @@ <s:form id="exportForm" namespace="/dbeditor" method="post"> <s:hidden key="tableName" label=''/> <s:textfield key="exportFileName" required="true" size="100" - label="%{getText('echobase.common.exportFileName')}"/> + label="%{getText('echobase.label.exportFileName')}"/> <br/> <s:submit key="echobase.action.exportTable" action="doExport" @@ -257,7 +257,7 @@ <fieldset id="noRowSelected"> <legend> - <s:text name="echobase.dbeditor.edit"> + <s:text name="echobase.legend.dbeditor.edit"> <s:param value="%{tableI18nName}"/> </s:text> </legend> @@ -267,7 +267,7 @@ <s:form id="editForm" namespace="/dbeditor"> <fieldset> <legend> - <s:text name="echobase.dbeditor.edit"> + <s:text name="echobase.legend.dbeditor.edit"> <s:param value="%{tableI18nName}"/> </s:text> </legend> @@ -316,7 +316,7 @@ </s:iterator> </fieldset> <ul class="toolbar floatRight"> - <li><s:submit name='resetAction' key="echobase.common.reset" + <li><s:submit name='resetAction' key="echobase.action.reset" theme="simple" onclick="return false;"/> </li> <li><s:submit name="submitAction" key="echobase.action.save" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/modifImportResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/modifImportResult.jsp 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/modifImportResult.jsp 2011-11-21 16:12:09 UTC (rev 104) @@ -26,11 +26,11 @@ <title><s:text name="echobase.title.dbEditor"/></title> <h2> - <s:text name="echobase.dbEditor.propertyDiffsResult"> + <s:text name="echobase.info.dbeditor.propertyDiffsResult"> <s:param value="%{propertyDiffs.size}"/> </s:text> </h2> <s:a namespace="/dbeditor" action="dbeditor"> <s:param name="tableName" value="%{tableName}"/> - <s:text name="echobase.common.return"/> + <s:text name="echobase.action.return"/> </s:a> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/createEmbeddedApplication.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/createEmbeddedApplication.jsp 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/createEmbeddedApplication.jsp 2011-11-21 16:12:09 UTC (rev 104) @@ -32,16 +32,16 @@ <br/> <fieldset> - <legend><s:text name="echobase.embeddedApplication.configuration"/></legend> + <legend><s:text name="echobase.legend.embeddedApplication.configuration"/></legend> <s:checkboxlist list="voyages" key="voyageIds" - label="%{getText('echobase.common.voyagesToSelect')}"/> + label="%{getText('echobase.label.voyageToSelect')}"/> <s:textfield key="fileName" required="true" size="100" - label="%{getText('echobase.common.embeddedApplicationFileName')} (*)"/> + label="%{getText('echobase.label.embeddedApplicationFileName')} (*)"/> <s:label value="%{warFileName}" readonly="true" - label="%{getText('echobase.common.embeddedWarFileName')}"/> + label="%{getText('echobase.label.embeddedWarFileName')}"/> <s:if test="!hasActionErrors()"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp 2011-11-21 16:12:09 UTC (rev 104) @@ -74,22 +74,22 @@ <s:form id="exportQueryForm" namespace="/export"> - <s:select key="query.topiaId" label="%{getText('echobase.common.sqlQueries')}" + <s:select key="query.topiaId" label="%{getText('echobase.label.sqlQueries')}" list="queries" headerKey="" headerValue=""/> <br/> <fieldset> - <legend><s:text name="echobase.sqlQuery.configuration"/></legend> + <legend><s:text name="echobase.legend.sqlQuery.configuration"/></legend> <s:textarea key="query.name" required="true" cols="160" rows="1" - label="%{getText('echobase.common.query.name')}"/> + label="%{getText('echobase.label.query.name')}"/> <s:textarea key="query.description" required="true" cols="160" rows="2" - label="%{getText('echobase.common.query.description')}"/> + label="%{getText('echobase.label.query.description')}"/> <s:textarea key="query.sqlQuery" required="true" cols="160" rows="4" - label="%{getText('echobase.common.sqlQuery')}"/> + label="%{getText('echobase.label.query.sql')}"/> <s:if test="queryExists"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp 2011-11-21 16:12:09 UTC (rev 104) @@ -40,14 +40,14 @@ <s:form action="downloadExportSqlResult" namespace="/export"> <fieldset> - <legend><s:text name="echobase.sqlQuery.result"/></legend> + <legend><s:text name="echobase.legend.sqlQuery.result"/></legend> <s:hidden key="sql" label=""/> <s:textfield key="fileName" required="true" size="100" - label="%{getText('echobase.common.exportFileName')}"/> + label="%{getText('echobase.label.exportFileName')}"/> <s:submit key="echobase.action.exportSqlData" align="left"/> <br/> - <sjg:grid id="rows" caption="%{getText('echobase.common.request.result')}" + <sjg:grid id="rows" caption="%{getText('echobase.header.request.result')}" dataType="json" href="%{loadUrl}" gridModel="datas" pager="true" pagerButtons="true" pagerInput="true" navigator="true" autowidth="true" rownumbers="false" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2011-11-21 16:12:09 UTC (rev 104) @@ -23,6 +23,6 @@ --%> <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.label.welcome"/></title> +<title><s:text name="echobase.title.welcome"/></title> -<h2><s:text name="echobase.label.welcome"/></h2> +<h2><s:text name="echobase.title.welcome"/></h2> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-21 16:12:09 UTC (rev 104) @@ -31,25 +31,27 @@ <fieldset> <legend> - <s:text name="echobase.common.import"/> + <s:text name="echobase.legend.import"/> </legend> <s:select key="selectedVoyageId" label='%{getText("echobase.common.voyage")}' list="voyages" emptyOption="true" headerKey="-1" - headerValue='%{getText("echobase.voyage.selectHeader")}' /> + headerValue='%{getText("echobase.header.voyageSelect")}' /> - <s:file name="importModel.accessImport" key="echobase.importFile.access"/> + <s:file name="importModel.accessImport" + key="echobase.label.import.access"/> <s:file name="importModel.accousticImport" - key="echobase.importFile.accoustique"/> + key="echobase.label.import.accoustique"/> <s:file name="importModel.pecherieImport" - key="echobase.importFile.pecherie"/> + key="echobase.label.import.pecherie"/> <s:file name="importModel.lectureAgeGenImport" - key="echobase.importFile.lectureAgeGen"/> - <s:file name="importModel.eventsImport" key="echobase.importFile.events"/> + key="echobase.label.import.lectureAgeGen"/> + <s:file name="importModel.eventsImport" + key="echobase.label.import.events"/> <s:file name="importModel.typeEchoSpeciesImport" - key="echobase.importFile.typeEchoSpecies"/> + key="echobase.label.import.typeEchoSpecies"/> <s:textarea name="importModel.comment" rows="4" cols="50" key="echobase.common.comment"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importProgress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importProgress.jsp 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/importProgress.jsp 2011-11-21 16:12:09 UTC (rev 104) @@ -30,4 +30,4 @@ <sj:progressbar value="%{EchoBaseActionContext.progression}"/> <%-- TODO letellier 20111104 : Add warn icon --%> -<p><s:text name="echobase.msg.warnImportInProgress"/></p> \ No newline at end of file +<p><s:text name="echobase.message.warnImportInProgress"/></p> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2011-11-21 16:05:50 UTC (rev 103) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2011-11-21 16:12:09 UTC (rev 104) @@ -57,7 +57,7 @@ <h2><s:text name="echobase.title.users"/></h2> <br/> -<sjg:grid id="users" caption="%{getText('echobase.title.users')}" +<sjg:grid id="users" caption="%{getText('echobase.header.user.gridTitle')}" dataType="json" href="%{loadUrl}" gridModel="users" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true"

1 0

r103 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor
by tchemit＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: tchemit Date: 2011-11-21 17:05:50 +0100 (Mon, 21 Nov 2011) New Revision: 103 Url: http://forge.codelutin.com/repositories/revision/echobase/103 Log: fix NPE Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-21 15:40:40 UTC (rev 102) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-21 16:05:50 UTC (rev 103) @@ -45,7 +45,9 @@ public String input() throws Exception { load(); - exportFileName = "export-" + tableMeta.getEntityType().getSimpleName() + ".csv"; + if (tableMeta != null) { + exportFileName = "export-" + tableMeta.getEntityType().getSimpleName() + ".csv"; + } return INPUT; }

1 0

r102 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions/dbeditor resources/config
by tchemit＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: tchemit Date: 2011-11-21 16:40:40 +0100 (Mon, 21 Nov 2011) New Revision: 102 Url: http://forge.codelutin.com/repositories/revision/echobase/102 Log: use selected export file name Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2011-11-21 15:26:30 UTC (rev 101) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2011-11-21 15:40:40 UTC (rev 102) @@ -49,21 +49,25 @@ protected String tableName; /** Default file name to create. */ - protected String fileName; + protected String exportFileName; - /** WTF ? */ + /** Stream of the file to export. */ protected InputStream inputStream; - /** WTF ? */ + /** Length of the file to export. */ protected long contentLength; - /** WTF ? */ + /** Type of the file to export. */ protected String contentType; public void setTableName(String tableName) { this.tableName = tableName; } + public void setExportFileName(String exportFileName) { + this.exportFileName = exportFileName; + } + public InputStream getInputStream() { return inputStream; } @@ -76,8 +80,8 @@ return contentType; } - public String getFileName() { - return fileName; + public String getExportFileName() { + return exportFileName; } @Override @@ -88,7 +92,6 @@ File file = dbEditorService.exportDatas(tableName); contentType = "text/csv"; - fileName = file.getName(); contentLength = file.length(); inputStream = new FileInputStream(file); Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-21 15:26:30 UTC (rev 101) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-21 15:40:40 UTC (rev 102) @@ -32,7 +32,8 @@ <package name="dbeditor" extends="loggued" namespace="/dbeditor"> <result-types> - <result-type name="redirectToDbEditor" class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + <result-type name="redirectToDbEditor" + class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> <param name="namespace">/dbeditor</param> <param name="actionName">dbeditor</param> <param name="tableName">${tableName}</param> @@ -86,7 +87,7 @@ <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> - <param name="contentDisposition">filename="${fileName}"</param> + <param name="contentDisposition">filename="${exportFileName}"</param> </result> </action>

1 0

r101 - in trunk: echobase-entities/src/main/resources/i18n echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor echobase-ui/src/main/webapp/css
by tchemit＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: tchemit Date: 2011-11-21 16:26:30 +0100 (Mon, 21 Nov 2011) New Revision: 101 Url: http://forge.codelutin.com/repositories/revision/echobase/101 Log: improve ui for dbeditor Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-21 15:26:30 UTC (rev 101) @@ -6,12 +6,18 @@ echobase.common.admin=Administrateur echobase.common.age= echobase.common.ageClass=ageClass +echobase.common.aggregationHierarchy= +echobase.common.aggregationLevel= +echobase.common.aggregationLevelName= +echobase.common.aggregationLevelObservedWeight= +echobase.common.aggregationLevelSampledWeight= echobase.common.altCallsign= echobase.common.areaOfOperation=areaOfOperation echobase.common.areaOfOperationName= echobase.common.author= echobase.common.authorEmail= echobase.common.axis= +echobase.common.bathymetre= echobase.common.binSizePingAxis= echobase.common.binSizeRangeAxis= echobase.common.binUnitsPingAxis= @@ -39,6 +45,7 @@ echobase.common.classMeaning= echobase.common.codeMemo= echobase.common.comment= +echobase.common.commonName= echobase.common.count= echobase.common.data=data echobase.common.dataAcquisition=dataAcquisition @@ -66,6 +73,13 @@ echobase.common.echoBaseUser=Utilisateur echobase.common.echoBaseUserDTO= echobase.common.echosounderSoundSpeed= +echobase.common.echotype= +echobase.common.echotypeDepthStratum= +echobase.common.echotypeGeniusSpecies= +echobase.common.echotypeLengthCategory= +echobase.common.echotypeMeaning= +echobase.common.echotypeName= +echobase.common.elevationRatio= echobase.common.email=Courriel echobase.common.endDate= echobase.common.endPort= @@ -82,6 +96,17 @@ echobase.common.exportQueryDTO= echobase.common.fillValue= echobase.common.frequency= +echobase.common.gear= +echobase.common.gearMetadata= +echobase.common.gearMetadataName= +echobase.common.gearMetadataValue= +echobase.common.gearName= +echobase.common.gearShootingEndLatitude= +echobase.common.gearShootingEndLongitude= +echobase.common.gearShootingStartLatitude= +echobase.common.gearShootingStartLongitude= +echobase.common.gearType= +echobase.common.gearTypeName= echobase.common.genusSpecies= echobase.common.geospatialLatMax= echobase.common.geospatialLatMin= @@ -95,8 +120,10 @@ echobase.common.id=Identifiant echobase.common.impacte= echobase.common.individu= +echobase.common.individual= echobase.common.individualMeasureParameter= echobase.common.individualMeasureParameterValue= +echobase.common.individualValue= echobase.common.institution= echobase.common.keywords= echobase.common.label= @@ -109,14 +136,25 @@ echobase.common.libelle= echobase.common.licence= echobase.common.linestring= +echobase.common.localisation= +echobase.common.locationMaxLatitude= +echobase.common.locationMaxLongitude= +echobase.common.locationMinLatitude= +echobase.common.locationMinLongitude= echobase.common.loggedDataDatatype= echobase.common.loggedDataFormat= echobase.common.longName= echobase.common.longitudeEndFillageEngin= echobase.common.longitudeStartFillageEngin= +echobase.common.meaning= echobase.common.measureStep= echobase.common.measureType= echobase.common.measureUnit= +echobase.common.measurementBinSize= +echobase.common.measurementMetadata= +echobase.common.measurementMetadataName= +echobase.common.measurementTypeName= +echobase.common.measurementUnit= echobase.common.metadata=metadata echobase.common.metadataClass=metadataClass echobase.common.mission=mission @@ -126,11 +164,20 @@ echobase.common.modificationText=Modification echobase.common.name=Nom echobase.common.notes= +echobase.common.numberAtAge= +echobase.common.numberAtLength= +echobase.common.numberSampled= echobase.common.operation= echobase.common.operationEngineParameterValue= +echobase.common.operationGearMetadataValue= +echobase.common.operationMeasurementMetadataValue= +echobase.common.operationMetadata= +echobase.common.operationMetadataName= +echobase.common.operationMetadataValue= echobase.common.operationParameter= echobase.common.operationParameterValue= echobase.common.operationType= +echobase.common.operationTypeName= echobase.common.operator= echobase.common.organisationLevelAcknowledgements= echobase.common.organisationReferences= @@ -155,10 +202,14 @@ echobase.common.regionName= echobase.common.relatedActivity= echobase.common.sample= +echobase.common.sampleAge= +echobase.common.sampleAggregation= echobase.common.sampleCSJ= echobase.common.sampleLength= +echobase.common.sampleWeight= echobase.common.scaleFactor= echobase.common.scientistName= +echobase.common.seafloorSubstrate= echobase.common.size= echobase.common.soundSpeedCalculations= echobase.common.sounderConstant= @@ -171,6 +222,8 @@ echobase.common.startPort= echobase.common.startTimeFillageEngin= echobase.common.station=station +echobase.common.stationStartLatitude= +echobase.common.stationStartLongitude= echobase.common.surface= echobase.common.timeCoverageEnd= echobase.common.timeCoverageStart= @@ -232,7 +285,9 @@ echobase.common.voyage=Campagne echobase.common.voyageDescription= echobase.common.voyageEndDate= +echobase.common.voyageEndHarbour= echobase.common.voyageName= echobase.common.voyageStartDate= +echobase.common.voyageStartHarbour= echobase.common.weight= echobase.config.data.directory.description=Chemin de l'application Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-21 15:26:30 UTC (rev 101) @@ -35,9 +35,17 @@ private static final long serialVersionUID = 1L; + protected String exportFileName; + + public String getExportFileName() { + return exportFileName; + } + @Override public String input() throws Exception { + load(); + exportFileName = "export-" + tableMeta.getEntityType().getSimpleName() + ".csv"; return INPUT; } 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 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-21 15:26:30 UTC (rev 101) @@ -93,9 +93,11 @@ echobase.title.dbEditor=Modification de la base echobase.title.entityModificationLogs=Journal des modifications echobase.title.export=Export +echobase.title.exportTable=Exporter une table echobase.title.import=Imports echobase.title.importProgress=Import en cours echobase.title.importResult=Résultats de l'import +echobase.title.importTable=Importer une table echobase.title.login=Connexion echobase.title.modification.detail=Détail de la modification echobase.title.users=Adminitration des utilisateurs 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 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-21 15:26:30 UTC (rev 101) @@ -170,29 +170,44 @@ } </script> -<div class="inline"> - <s:select key="tableName" label='%{getText("echobase.common.tableName")}' +<s:select key="tableName" label='%{getText("echobase.common.tableName")}' list="tableNames" headerKey="" headerValue=""/> - <s:if test="tableSelected"> - <s:form id="importForm" namespace="/dbeditor" method="post" - enctype="multipart/form-data" cssClass="floatLeft"> +<br class="clearBoth"/> - <s:hidden key="tableName" label=''/> - <s:file key="importFile" required="true" - label="%{getText('echobase.common.importFile')}"/> - <s:submit key="echobase.action.importTable" action="doImport" /> - </s:form> +<s:if test="tableSelected"> - <s:form id="exportForm" namespace="/dbeditor" theme="simple" cssClass="floatRight"> + <sj:tabbedpanel id="io" collapsible="true"> + <sj:tab id="tab_importForm" target="importForm" title="ss" + label="%{getText('echobase.title.importTable')}"/> - <s:hidden key="tableName" label=''/> - <s:submit key="echobase.action.exportTable" action="doExport" /> - </s:form> - + <sj:tab id="tab_exportForm" target="exportForm" + label="%{getText('echobase.title.exportTable')}"/> + + <s:form id="importForm" namespace="/dbeditor" method="post" + enctype="multipart/form-data"> + + <s:hidden key="tableName" label=''/> + <s:file key="importFile" required="true" + label="%{getText('echobase.common.importFile')}"/> + <br/> + <s:submit key="echobase.action.importTable" action="doImport" + align="right"/> + </s:form> + + <s:form id="exportForm" namespace="/dbeditor" method="post"> + <s:hidden key="tableName" label=''/> + <s:textfield key="exportFileName" required="true" size="100" + label="%{getText('echobase.common.exportFileName')}"/> + + <br/> + <s:submit key="echobase.action.exportTable" action="doExport" + align="right"/> + </s:form> + + </sj:tabbedpanel> + </s:if> - -</div> <br class="clearBoth"/> <s:if test="tableSelected"> Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2011-11-21 15:26:30 UTC (rev 101) @@ -33,11 +33,18 @@ font-size: 11px; } -.ui-tabs-panel pre { +.ui-tabs-panel { font-family: monospace; font-size: 9pt; } +.ui-tabs .ui-tabs-nav li a { + float: left; + padding: .5em .1em; + text-decoration: none; + font-size: 11px; +} + #body { /*min-height: 500px;*/ float: left;

1 0

r100 - trunk/src/doc/model
by tchemit＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: tchemit Date: 2011-11-21 13:00:23 +0100 (Mon, 21 Nov 2011) New Revision: 100 Url: http://forge.codelutin.com/repositories/revision/echobase/100 Log: set as bianry models Modified: trunk/src/doc/model/EchoBase_structure_V5.mm Property changes on: trunk/src/doc/model/EchoBase_structure_V5.mm ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0