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

r603 - trunk/src/site/en/rst
by mdoray＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: mdoray Date: 2012-09-03 17:16:40 +0200 (Mon, 03 Sep 2012) New Revision: 603 Url: http://forge.codelutin.com/repositories/revision/echobase/603 Log: >From scmwebeditor -- Modified: trunk/src/site/en/rst/index.rst Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2012-09-03 14:54:12 UTC (rev 602) +++ trunk/src/site/en/rst/index.rst 2012-09-03 15:16:40 UTC (rev 603) @@ -29,8 +29,8 @@ Présentation ------------ -A Faire... -*TODO Translate this in english* +We have designed an open software suite for storing fisheries acoustic data +and computing acoustic indicators for survey-based ecosystem monitoring. It comprises a postgreSQL database designed to store acoustic, navigation and fishing data from ecosystemic surveys (Echobase) and a suite of R codes (EchoR) for computing fish population indicators based on Echobase data. Echobase provide a web-browser interface for importing, editing and querying data, large storage capacities, and an easy integration into Geographical Information Systems or dynamic websites. The Echobase acoustic metadata format follows the WGFAST Topic Group on metadata standards recommendations. Les documents -------------

1 0

r602 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication echobase-ui/src/main/java/fr/ifremer/echobase/ui
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 16:54:12 +0200 (Mon, 03 Sep 2012) New Revision: 602 Url: http://forge.codelutin.com/repositories/revision/echobase/602 Log: fixes #1453: Jdbc drivers in embedded applications are corrupted refs #1438: Choix d'une base de travail (creation application embarquee) Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java 2012-09-03 14:46:19 UTC (rev 601) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java 2012-09-03 14:54:12 UTC (rev 602) @@ -56,18 +56,6 @@ protected EchoBaseDbMeta dbMeta; public static EchoBaseServiceContext newContext( - EchoBaseServiceContext serviceContext, - TopiaContext internalTransaction, - TopiaContext transaction) { - return newContext(serviceContext.getLocale(), - internalTransaction, - transaction, - serviceContext.getConfiguration(), - serviceContext.getDbMeta() - ); - } - - public static EchoBaseServiceContext newContext( Locale locale, TopiaContext internalTransaction, TopiaContext transaction, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java 2012-09-03 14:46:19 UTC (rev 601) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/embeddedapplication/EmbeddedApplicationService.java 2012-09-03 14:54:12 UTC (rev 602) @@ -58,6 +58,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.OutputStreamWriter; import java.net.URISyntaxException; import java.util.List; @@ -107,9 +108,12 @@ // create new service context EchoBaseServiceContext newServiceContext = - DefaultEchoBaseServiceContext.newContext(serviceContext, - null, - null); + DefaultEchoBaseServiceContext.newContext( + getLocale(), + null, + null, + getConfiguration(), + getDbMeta()); EchoBaseUser admin; try { @@ -120,23 +124,13 @@ } // create working db in /db - JdbcConfiguration dbConf = JdbcConfiguration.newEmbeddedConfig(dir); - TopiaContext rootContext = EchobaseTopiaContexts.newWorkingDb(dbConf); try { + importWorkingDb(model, dir, exportZipFile, newServiceContext, admin); - newServiceContext.setTransaction(rootContext.beginTransaction()); - model.incrementsProgression(); + } catch (Exception eee) { - importDb(model, newServiceContext, exportZipFile, admin); - - } catch (Exception eee) { - rollbackTransaction( - newServiceContext.getTransaction(), - "Could not rollback h2 embedded database at " + dir); throw new EchoBaseTechnicalException( - "Could not create h2 embedded database at " + dir, eee); - } finally { - EchoBaseEntityHelper.releaseRootContext(rootContext); + "Could not create h2 working database at " + dir, eee); } try { @@ -225,8 +219,43 @@ newServiceContext.setInternalTransaction(null); EchoBaseEntityHelper.releaseRootContext(internalRootContext); } + } + protected void importWorkingDb(EmbeddedApplicationConfiguration model, + File dir, + File exportZipFile, + EchoBaseServiceContext newServiceContext, + EchoBaseUser admin) throws IOException, TopiaException { + JdbcConfiguration dbConf = JdbcConfiguration.newEmbeddedConfig(dir); + TopiaContext rootContext = EchobaseTopiaContexts.newWorkingDb(dbConf); + try { + // create db schema + rootContext.createSchema(); + + // inject a new transaction in service context + newServiceContext.setTransaction(rootContext.beginTransaction()); + + model.incrementsProgression(); + + // prepare import configuration + ImportDbConfiguration importConfiguration = + new ImportDbConfiguration(model, getLocale()); + importConfiguration.getInput().setFile(exportZipFile); + File importTempDir = new File(model.getWorkingDirectory(), "importDb"); + importConfiguration.setWorkingDirectory(importTempDir); + + // do import to embedded working db + newServiceContext.getService(ImportDbService.class).importDb( + importConfiguration, admin, false, true); + + } finally { + // remove current transaction + newServiceContext.setTransaction(null); + + // release any connexion to the working db + EchoBaseEntityHelper.releaseRootContext(rootContext); + } } protected void closeContext(TopiaContext tx, String message) { @@ -388,19 +417,44 @@ } } - protected void importDb(EmbeddedApplicationConfiguration model, - EchoBaseServiceContext newServiceContext, - File exportZipFile, - EchoBaseUser admin) throws IOException, TopiaException { - ImportDbConfiguration importConfiguration = - new ImportDbConfiguration(model, getLocale()); - importConfiguration.getInput().setFile(exportZipFile); - File importTempDir = new File(model.getWorkingDirectory(), "importDb"); - importConfiguration.setWorkingDirectory(importTempDir); - - ImportDbService importDbService = - newServiceContext.getService(ImportDbService.class); - importDbService.importDb(importConfiguration, admin, false, true); + public void copyEmbeddedBinaryFile(String resourceName, + File targetDirectory) throws IOException { + String resourcePath = EMBEDDED_PATH + resourceName; + InputStream inputStream = getClass().getResourceAsStream(resourcePath); + Preconditions.checkNotNull(inputStream, + "could not find resource " + resourcePath); + try { + File outputFile = new File(targetDirectory, resourceName); + if (log.isInfoEnabled()) { + log.info("Copy binary file from " + resourceName + " to " + + outputFile); + } + OutputStream outputStream = new FileOutputStream(outputFile); + try { + IOUtils.copy(inputStream, outputStream); + outputStream.close(); + } finally { + IOUtils.closeQuietly(outputStream); + } + inputStream.close(); + } finally { + IOUtils.closeQuietly(inputStream); + } } +// protected void importDb(EmbeddedApplicationConfiguration model, +// EchoBaseServiceContext newServiceContext, +// File exportZipFile, +// EchoBaseUser admin) throws IOException, TopiaException { +// ImportDbConfiguration importConfiguration = +// new ImportDbConfiguration(model, getLocale()); +// importConfiguration.getInput().setFile(exportZipFile); +// File importTempDir = new File(model.getWorkingDirectory(), "importDb"); +// importConfiguration.setWorkingDirectory(importTempDir); +// +// ImportDbService importDbService = +// newServiceContext.getService(ImportDbService.class); +// importDbService.importDb(importConfiguration, admin, false, true); +// } + } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2012-09-03 14:46:19 UTC (rev 601) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2012-09-03 14:54:12 UTC (rev 602) @@ -249,8 +249,7 @@ log.info("Copy driver " + pilotFileName + " to directory " + libDirectory); } - service.copyEmbeddedFiles( - pilotFileName, libDirectory, null); + service.copyEmbeddedBinaryFile(pilotFileName, libDirectory); } } }

1 0

r601 - in trunk/echobase-domain/src: main/java/fr/ifremer/echobase test/java/fr/ifremer/echobase
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 16:46:19 +0200 (Mon, 03 Sep 2012) New Revision: 601 Url: http://forge.codelutin.com/repositories/revision/echobase/601 Log: fix not well siolated test Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java 2012-09-03 13:14:15 UTC (rev 600) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java 2012-09-03 14:46:19 UTC (rev 601) @@ -40,12 +40,16 @@ */ public class EchoBaseDateConverter extends DateTimeConverter { - public static void initDateConverter() { + public static Converter initDateConverter() { Converter converter = ConverterUtil.getConverter(Date.class); if (converter != null && !(converter instanceof EchoBaseDateConverter)) { ConvertUtils.deregister(Date.class); ConvertUtils.register(new EchoBaseDateConverter(), Date.class); + + } else { + converter = null; } + return converter; } protected final DateFormat format = Modified: trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java =================================================================== --- trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java 2012-09-03 13:14:15 UTC (rev 600) +++ trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java 2012-09-03 14:46:19 UTC (rev 601) @@ -26,7 +26,8 @@ import fr.ifremer.echobase.entities.EntityModificationLogImpl; import junit.framework.Assert; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.beanutils.ConversionException; +import org.apache.commons.beanutils.ConvertUtils; +import org.apache.commons.beanutils.Converter; import org.junit.Test; import java.util.Calendar; @@ -49,22 +50,31 @@ assertDate(date); } - @Test(expected = ConversionException.class) - public void testConvertFromDefaultBeanUtilsConverter() throws Exception { + // This test is not isolated and can failed... In fact we just need to + // make sure next test is ok, not this one... +// @Test(expected = ConversionException.class) +// public void testConvertFromDefaultBeanUtilsConverter() throws Exception { +// +// BeanUtils.setProperty( +// new EntityModificationLogImpl(), +// EntityModificationLog.PROPERTY_MODIFICATION_DATE, DATE); +// } - EntityModificationLog bean = new EntityModificationLogImpl(); - BeanUtils.setProperty(bean, EntityModificationLog.PROPERTY_MODIFICATION_DATE, DATE); - - } - @Test public void testConvertFromBeanUtilsConverterWithOur() throws Exception { - EchoBaseDateConverter.initDateConverter(); - EntityModificationLog bean = new EntityModificationLogImpl(); - BeanUtils.setProperty(bean, EntityModificationLog.PROPERTY_MODIFICATION_DATE, DATE); - Date date = bean.getModificationDate(); - assertDate(date); + Converter oldDateConverter = EchoBaseDateConverter.initDateConverter(); + try { + EntityModificationLog bean = new EntityModificationLogImpl(); + BeanUtils.setProperty(bean, EntityModificationLog.PROPERTY_MODIFICATION_DATE, DATE); + Date date = bean.getModificationDate(); + assertDate(date); + } finally { + if (oldDateConverter != null) { + ConvertUtils.deregister(Date.class); + ConvertUtils.register(oldDateConverter, Date.class); + } + } } private void assertDate(Object date) {

1 0

r600 - in trunk/echobase-ui/src/main: resources/config webapp/WEB-INF/includes webapp/WEB-INF/jsp/workingDb
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 15:14:15 +0200 (Mon, 03 Sep 2012) New Revision: 600 Url: http://forge.codelutin.com/repositories/revision/echobase/600 Log: change modificationLog action to workingDb package Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp Removed: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modificationLogs.jsp Modified: 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/webapp/WEB-INF/includes/header.jsp Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-09-03 12:58:06 UTC (rev 599) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-09-03 13:14:15 UTC (rev 600) @@ -65,12 +65,8 @@ <result>/WEB-INF/jsp/user/userList.jsp</result> </action> -  - <action name="logs" - class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> - <result>/WEB-INF/jsp/modificationLogs.jsp</result> - </action> +  <action name="getUsers" class="fr.ifremer.echobase.ui.actions.user.GetUsers"> Modified: trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2012-09-03 12:58:06 UTC (rev 599) +++ trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2012-09-03 13:14:15 UTC (rev 600) @@ -108,6 +108,12 @@ <result type="showList"/> </action> +  + <action name="logs" + class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> + <result>/WEB-INF/jsp/workingDb/modifications.jsp</result> + </action> + </package> </struts> 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-03 12:58:06 UTC (rev 599) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-03 13:14:15 UTC (rev 600) @@ -115,7 +115,7 @@ </s:a> </li> <li> - <s:a action="logs" namespace="/user" cssClass="journal"> + <s:a action="logs" namespace="/workingDb" cssClass="journal"> <span><s:text name="echobase.menu.logs"/></span> </s:a> </li> @@ -155,7 +155,7 @@ </s:a> </li> <li> - <s:a action="logs" namespace="/user" cssClass="journal"> + <s:a action="logs" namespace="/workingDb" cssClass="journal"> <span><s:text name="echobase.menu.logs"/></span> </s:a> </li> Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modificationLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modificationLogs.jsp 2012-09-03 12:58:06 UTC (rev 599) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modificationLogs.jsp 2012-09-03 13:14:15 UTC (rev 600) @@ -1,93 +0,0 @@ -<%-- -#%L - EchoBase :: UI - $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% ---%> -<%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> -<script type="text/javascript" - src="<s:url value='/js/gridHelper.js' />"></script> -<s:set var="emptySelection"> - <s:text name="echobase.message.noEntrySelection"/> -</s:set> -<script type="text/javascript"> - - jQuery(document).ready(function () { - $.addRowSelectTopic('datas', function (event) { - $('#extraInfos').show(); - var id = $("tr[aria-selected=true] td[aria-describedby='datas_entityId']").text(); - $('#modificationEntityId').html(id); - - var text = $("tr[aria-selected=true] td[aria-describedby='datas_modificationText']").text(); - $('#modificationTextContainter').html(text); - }); - $.addClearSelectTopic('datas', function (event) { - $('#extraInfos').hide(); - $('#modificationTextContainter').html("${emptySelection}"); - }); - $.addEvenAndOddClasses('datas'); - }); -</script> - -<title><s:text name="echobase.title.entityModificationLogs"/></title> -<s:url id="loadUrl" action="getEntityModificationLogs" namespace="/user" - escapeAmp="false"/> - -<sjg:grid id="datas" dataType="json" href="%{loadUrl}" gridModel="datas" - pager="true" pagerButtons="true" pagerInput="true" navigator="true" - autowidth="true" rownumbers="false" viewrecords="true" - navigatorEdit="false" navigatorSearch="true" - navigatorDelete="false" navigatorAdd="false" - rowList="10,15,20,50,100,250,500" rowNum="10" - onSelectRowTopics='datas-rowSelect' - onCompleteTopics="datas-clearSelect,datas-CompleteTopics" - navigatorSearchOptions="{multipleGroup:false,multipleSearch:false,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn']}"> - - <sjg:gridColumn name="entityType" sortable="true" - title="%{getText('echobase.common.entityType')}"/> - <sjg:gridColumn name="entityId" sortable="true" - title="%{getText('echobase.common.entityId')}"/> - <sjg:gridColumn name="modificationDate" sortable="true" - title="%{getText('echobase.common.modificationDate')}"/> - <sjg:gridColumn name="modificationText" sortable="true" - title="%{getText('echobase.common.modificationText')}"/> - <sjg:gridColumn name="modificationUser" sortable="true" - title="%{getText('echobase.common.modificationUser')}"/> - -</sjg:grid> -<br/> -<fieldset> - <legend><s:text name="echobase.title.modification.detail"/></legend> - <div id="extraInfos"> - <s:label key='echobase.common.entityId' value=''/> - <div class="clearBoth"/> - <pre id='modificationEntityId' style="font-weight: bold;"></pre> - <br/> - </div> - <s:label key='echobase.common.modificationText' value=''/> - <div class="clearBoth"/> - <br/> - <pre id='modificationTextContainter' style="font-weight: bold;"></pre> -</fieldset> - - - Copied: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp (from rev 598, trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modificationLogs.jsp) =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp 2012-09-03 13:14:15 UTC (rev 600) @@ -0,0 +1,93 @@ +<%-- +#%L + EchoBase :: UI + $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% +--%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> +<script type="text/javascript" + src="<s:url value='/js/gridHelper.js' />"></script> +<s:set var="emptySelection"> + <s:text name="echobase.message.noEntrySelection"/> +</s:set> +<script type="text/javascript"> + + jQuery(document).ready(function () { + $.addRowSelectTopic('datas', function (event) { + $('#extraInfos').show(); + var id = $("tr[aria-selected=true] td[aria-describedby='datas_entityId']").text(); + $('#modificationEntityId').html(id); + + var text = $("tr[aria-selected=true] td[aria-describedby='datas_modificationText']").text(); + $('#modificationTextContainter').html(text); + }); + $.addClearSelectTopic('datas', function (event) { + $('#extraInfos').hide(); + $('#modificationTextContainter').html("${emptySelection}"); + }); + $.addEvenAndOddClasses('datas'); + }); +</script> + +<title><s:text name="echobase.title.entityModificationLogs"/></title> +<s:url id="loadUrl" action="getEntityModificationLogs" namespace="/user" + escapeAmp="false"/> + +<sjg:grid id="datas" dataType="json" href="%{loadUrl}" gridModel="datas" + pager="true" pagerButtons="true" pagerInput="true" navigator="true" + autowidth="true" rownumbers="false" viewrecords="true" + navigatorEdit="false" navigatorSearch="true" + navigatorDelete="false" navigatorAdd="false" + rowList="10,15,20,50,100,250,500" rowNum="10" + onSelectRowTopics='datas-rowSelect' + onCompleteTopics="datas-clearSelect,datas-CompleteTopics" + navigatorSearchOptions="{multipleGroup:false,multipleSearch:false,sopt:['eq','ne','cn','nc','bw','bn','ew','en','lt','le','gt','ge','nu','nn']}"> + + <sjg:gridColumn name="entityType" sortable="true" + title="%{getText('echobase.common.entityType')}"/> + <sjg:gridColumn name="entityId" sortable="true" + title="%{getText('echobase.common.entityId')}"/> + <sjg:gridColumn name="modificationDate" sortable="true" + title="%{getText('echobase.common.modificationDate')}"/> + <sjg:gridColumn name="modificationText" sortable="true" + title="%{getText('echobase.common.modificationText')}"/> + <sjg:gridColumn name="modificationUser" sortable="true" + title="%{getText('echobase.common.modificationUser')}"/> + +</sjg:grid> +<br/> +<fieldset> + <legend><s:text name="echobase.title.modification.detail"/></legend> + <div id="extraInfos"> + <s:label key='echobase.common.entityId' value=''/> + <div class="clearBoth"/> + <pre id='modificationEntityId' style="font-weight: bold;"></pre> + <br/> + </div> + <s:label key='echobase.common.modificationText' value=''/> + <div class="clearBoth"/> + <br/> + <pre id='modificationTextContainter' style="font-weight: bold;"></pre> +</fieldset> + + + Property changes on: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/modifications.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r599 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 14:58:06 +0200 (Mon, 03 Sep 2012) New Revision: 599 Url: http://forge.codelutin.com/repositories/revision/echobase/599 Log: fix login validator Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java 2012-09-03 11:26:36 UTC (rev 598) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/LoginValidator.java 2012-09-03 12:58:06 UTC (rev 599) @@ -25,6 +25,7 @@ import com.opensymphony.xwork2.validator.ValidationException; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.services.ServiceFactoryAware; import fr.ifremer.echobase.services.UserService; /** @@ -38,8 +39,10 @@ @Override public void validateWhenNotSkip(Object object) throws ValidationException { + ServiceFactoryAware serviceFactoryAware = (ServiceFactoryAware) object; + UserService userService = - (UserService) getFieldValue("userService", object); + serviceFactoryAware.getService(UserService.class); String login = (String) getFieldValue("email", object); String password = (String) getFieldValue("password", object);

1 0

r598 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 13:26:36 +0200 (Mon, 03 Sep 2012) New Revision: 598 Url: http://forge.codelutin.com/repositories/revision/echobase/598 Log: can anylonger modifiy name if query exists, ... so no need to test it) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java 2012-09-03 11:26:10 UTC (rev 597) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java 2012-09-03 11:26:36 UTC (rev 598) @@ -71,10 +71,13 @@ String queryName = exportQuery.getName(); // check query does not already exists with this name - boolean queryExists = dao.isQueryExists(id, queryName); + if (mustCreate) { - if (queryExists) { - throw new ExportQueryNameAlreadyExistException(); + boolean queryExists = dao.isQueryExists(id, queryName); + + if (queryExists) { + throw new ExportQueryNameAlreadyExistException(); + } } ExportQuery entityToSave;

1 0

r597 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 13:26:10 +0200 (Mon, 03 Sep 2012) New Revision: 597 Url: http://forge.codelutin.com/repositories/revision/echobase/597 Log: natural id is immutable Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2012-09-03 11:25:18 UTC (rev 596) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2012-09-03 11:26:10 UTC (rev 597) @@ -113,15 +113,15 @@ <legend><s:text name="echobase.legend.sqlQuery.configuration"/></legend> <s:textarea key="query.name" required="true" cols="160" rows="1" - readonly="%{queryExists and !canUpdateQuery}" + readonly="%{queryExists or !canUpdateQuery}" label="%{getText('echobase.label.query.name')}"/> <s:textarea key="query.description" required="true" cols="160" rows="2" - readonly="%{queryExists and !canUpdateQuery}" + readonly="%{!canUpdateQuery}" label="%{getText('echobase.label.query.description')}"/> <s:textarea key="query.sqlQuery" required="true" cols="160" rows="4" - readonly="%{queryExists and !canUpdateQuery}" + readonly="%{!canUpdateQuery}" label="%{getText('echobase.label.query.sql')}"/> <s:if test="queryExists">

1 0

r596 - trunk/echobase-domain/src/main/xmi
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 13:25:18 +0200 (Mon, 03 Sep 2012) New Revision: 596 Url: http://forge.codelutin.com/repositories/revision/echobase/596 Log: natural id is immutable Modified: trunk/echobase-domain/src/main/xmi/echobase-internal.properties Modified: trunk/echobase-domain/src/main/xmi/echobase-internal.properties =================================================================== --- trunk/echobase-domain/src/main/xmi/echobase-internal.properties 2012-09-03 11:24:49 UTC (rev 595) +++ trunk/echobase-domain/src/main/xmi/echobase-internal.properties 2012-09-03 11:25:18 UTC (rev 596) @@ -51,7 +51,7 @@ fr.ifremer.echobase.entities.EchoBaseUser.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.naturalId=true -fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=false fr.ifremer.echobase.entities.ExportQuery.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.WorkingDbConfiguration.class.tagValue.naturalIdMutable=true

1 0

r595 - trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 13:24:49 +0200 (Mon, 03 Sep 2012) New Revision: 595 Url: http://forge.codelutin.com/repositories/revision/echobase/595 Log: fix login validation Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/Login-login-validation.xml Removed: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/Login-login-validation.xml (from rev 588, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/Login-login-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/Login-login-validation.xml 2012-09-03 11:24:49 UTC (rev 595) @@ -0,0 +1,35 @@ + +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="email"> + + <field-validator type="login"> + <message key="echobase.error.login.wrongLogin"/> + </field-validator> + </field> + +</validators> Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/Login-login-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml 2012-09-03 10:53:52 UTC (rev 594) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml 2012-09-03 11:24:49 UTC (rev 595) @@ -1,35 +0,0 @@ - -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> -<validators> - - <field name="email"> - - <field-validator type="login"> - <message key="echobase.error.login.wrongLogin"/> - </field-validator> - </field> - -</validators>

1 0

r594 - trunk/echobase-ui/src/main/webapp/WEB-INF/includes
by tchemit＠users.forge.codelutin.com 03 Sep '12

03 Sep '12

Author: tchemit Date: 2012-09-03 12:53:52 +0200 (Mon, 03 Sep 2012) New Revision: 594 Url: http://forge.codelutin.com/repositories/revision/echobase/594 Log: fix menu order Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 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-03 10:42:07 UTC (rev 593) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-03 10:53:52 UTC (rev 594) @@ -104,6 +104,12 @@ <span><s:text name="echobase.menu.importData"/></s:a></span> </li> <li> + <s:a action="manageExportQuery" namespace="/exportQuery" + cssClass="expDonnee"> + <span><s:text name="echobase.menu.export"/></span> + </s:a> + </li> + <li> <s:a action="dbeditor" namespace="/dbeditor" cssClass="modif"> <span><s:text name="echobase.menu.editData"/></span> </s:a> @@ -120,12 +126,6 @@ </span> </s:a> </li> - <li> - <s:a action="manageExportQuery" namespace="/exportQuery" - cssClass="expDonnee"> - <span><s:text name="echobase.menu.export"/></span> - </s:a> - </li> </s:if> <li> <s:a action="userList" namespace="/user" cssClass="user">

1 0