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

r485 - trunk/echobase-services/src/main/resources/embedded
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 17:04:16 +0200 (Tue, 03 Apr 2012) New Revision: 485 Url: http://forge.codelutin.com/repositories/revision/echobase/485 Log: fixes #1081: Application embarqu?\195?\169e g?\195?\169n?\195?\169r?\195?\169 n'utilise pas (sous linux) le bon nom de war Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.sh Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.sh =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-04-03 14:16:47 UTC (rev 484) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-04-03 15:04:16 UTC (rev 485) @@ -3,6 +3,6 @@ cd `dirname $0` CURRENTPWD=`pwd` ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=$CURRENTPWD/logs" -java $ECHOBASE_OPTS -jar echobase-ui-0.4-SNAPSHOT.war $* +java $ECHOBASE_OPTS -jar echobase-ui-${project.version}.war $* cd "$OLDPWD"

1 0

r484 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: maven-release Date: 2012-04-03 16:16:47 +0200 (Tue, 03 Apr 2012) New Revision: 484 Url: http://forge.codelutin.com/repositories/revision/echobase/484 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-03 14:16:40 UTC (rev 483) +++ trunk/echobase-entities/pom.xml 2012-04-03 14:16:47 UTC (rev 484) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.5</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-03 14:16:40 UTC (rev 483) +++ trunk/echobase-services/pom.xml 2012-04-03 14:16:47 UTC (rev 484) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.5</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-03 14:16:40 UTC (rev 483) +++ trunk/echobase-tools/pom.xml 2012-04-03 14:16:47 UTC (rev 484) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.5</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-03 14:16:40 UTC (rev 483) +++ trunk/echobase-ui/pom.xml 2012-04-03 14:16:47 UTC (rev 484) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.5</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-03 14:16:40 UTC (rev 483) +++ trunk/pom.xml 2012-04-03 14:16:47 UTC (rev 484) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.5</version> + <version>1.0-SNAPSHOT</version> <modules> <module>echobase-entities</module> @@ -79,12 +79,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5</url> + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r483 - tags
by maven-release＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: maven-release Date: 2012-04-03 16:16:40 +0200 (Tue, 03 Apr 2012) New Revision: 483 Url: http://forge.codelutin.com/repositories/revision/echobase/483 Log: [maven-release-plugin] copy for tag echobase-0.5 Added: tags/echobase-0.5/

1 0

r482 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: maven-release Date: 2012-04-03 16:16:33 +0200 (Tue, 03 Apr 2012) New Revision: 482 Url: http://forge.codelutin.com/repositories/revision/echobase/482 Log: [maven-release-plugin] prepare release echobase-0.5 Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-03 14:14:00 UTC (rev 481) +++ trunk/echobase-entities/pom.xml 2012-04-03 14:16:33 UTC (rev 482) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-03 14:14:00 UTC (rev 481) +++ trunk/echobase-services/pom.xml 2012-04-03 14:16:33 UTC (rev 482) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-03 14:14:00 UTC (rev 481) +++ trunk/echobase-tools/pom.xml 2012-04-03 14:16:33 UTC (rev 482) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-03 14:14:00 UTC (rev 481) +++ trunk/echobase-ui/pom.xml 2012-04-03 14:16:33 UTC (rev 482) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-03 14:14:00 UTC (rev 481) +++ trunk/pom.xml 2012-04-03 14:16:33 UTC (rev 482) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.5</version> <modules> <module>echobase-entities</module> @@ -79,12 +79,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.5 </developerConnection> </scm>

1 0

r481 - trunk/echobase-services
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 16:14:00 +0200 (Tue, 03 Apr 2012) New Revision: 481 Url: http://forge.codelutin.com/repositories/revision/echobase/481 Log: optimize dependencies Modified: trunk/echobase-services/pom.xml Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-03 14:03:47 UTC (rev 480) +++ trunk/echobase-services/pom.xml 2012-04-03 14:14:00 UTC (rev 481) @@ -41,11 +41,6 @@ <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - </dependency> -  <dependency>

1 0

r480 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 16:03:47 +0200 (Tue, 03 Apr 2012) New Revision: 480 Url: http://forge.codelutin.com/repositories/revision/echobase/480 Log: fixes #1051: Les dates lors d'un imports d'une table sont marqu?\195?\169es comme modifi?\195?\169es + utilisation i18n Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-04-03 14:03:20 UTC (rev 479) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-04-03 14:03:47 UTC (rev 480) @@ -42,6 +42,7 @@ import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import org.nuiton.util.PagerUtil; import org.nuiton.util.beans.BeanMonitor; import org.nuiton.util.beans.PropertyDiff; @@ -51,12 +52,14 @@ import org.nuiton.util.csv.ImportableColumn; import org.nuiton.util.decorator.Decorator; import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.web.struts2.FilterPagerUtil; import java.util.Collection; import java.util.List; +import java.util.Locale; import java.util.Map; +import static org.nuiton.i18n.I18n.l_; + /** * Service to edit the database. * @@ -92,7 +95,7 @@ //TODO Use an object to filter datas public Map<?, ?>[] getDatas(EchoBaseEntityEnum entityType, - FilterPagerUtil.FilterPagerBean pager, + TopiaFilterPagerUtil.FilterPagerBean pager, String sidx, Boolean ascendantOrder) { @@ -119,7 +122,7 @@ } public <E extends TopiaEntity> List<E> getEntities(TableMeta tableMeta, - FilterPagerUtil.FilterPagerBean pager, + TopiaFilterPagerUtil.FilterPagerBean pager, String sidx, Boolean ascendantOrder, String extraWhereQuery) { @@ -141,11 +144,11 @@ DecoratorService decoratorService = getDecoratorService(); // prepare the filter hql code - List<FilterPagerUtil.FilterRule> rules = pager.getRules(); + List<TopiaFilterPagerUtil.FilterRule> rules = pager.getRules(); List<String> strFilterRules = Lists.newLinkedList(); long timestamp = System.currentTimeMillis(); int index = 0; - for (FilterPagerUtil.FilterRule rule : rules) { + for (TopiaFilterPagerUtil.FilterRule rule : rules) { String ruleFilter; String field = rule.getField(); @@ -154,7 +157,7 @@ Preconditions.checkNotNull( columnMeta, "no property named " + columnMeta); - FilterPagerUtil.FilterOperation op = rule.getOp(); + TopiaFilterPagerUtil.FilterOperation op = rule.getOp(); String data = rule.getData(); String paramName = field + "_" + timestamp + (index++); String propertyName = "e." + field; @@ -211,7 +214,8 @@ } if (CollectionUtils.isNotEmpty(strFilterRules)) { - FilterPagerUtil.FilterOperationGroup groupOp = pager.getGroupOp(); + TopiaFilterPagerUtil.FilterOperationGroup groupOp = + pager.getGroupOp(); filterHql = StringUtils.join(strFilterRules, groupOp.name()); } } @@ -427,10 +431,12 @@ String topiaId = entity.getTopiaId(); buffer = new StringBuilder(messagePrefix).append('\n'); + Locale l = getLocale(); if (monitor == null) { // no monitor, means this is a creation of an object - buffer.append("Une entité a été crée d'identifiant ").append(topiaId); + buffer.append(l_( + l, "echobase.info.newEntityCreated", topiaId)); } else { PropertyDiff[] propertyDiffs = monitor.getPropertyDiffs(); @@ -444,12 +450,12 @@ } if (length == 1) { - buffer.append("Une propriété a été modifiée :"); + buffer.append(l_(l, "echobase.info.onePropertyModified")); } else { - buffer.append(length).append(" propriétés ont été modifiées :"); + buffer.append( + l_(l, "echobase.info.somePropertiesModified", length)); } - for (int i = 0; i < length; i++) { - PropertyDiff diff = propertyDiffs[i]; + for (PropertyDiff diff : propertyDiffs) { Object sourceValue = diff.getSourceValue(); Object targetValue = diff.getTargetValue(); @@ -461,18 +467,18 @@ // replace by the decorate value if (sourceValue != null) { sourceValue = getDecoratorService().decorate( - getLocale(), sourceValue, null); + l, sourceValue, null); } if (targetValue != null) { targetValue = getDecoratorService().decorate( - getLocale(), targetValue, null); + l, targetValue, null); } } - buffer.append(String.format("\n Propriété '%s', ancienne valeur : '%s', nouvelle valeur : '%s'", - propertyName, - sourceValue, - targetValue - )); + buffer.append("\n "); + buffer.append( + l_(l, "echobase.info.modifiedProperty", propertyName, + sourceValue, + targetValue)); } } @@ -577,10 +583,6 @@ propertyName + "_lib", propertyName, decorator -// EchobaseCsvUtil.newForeignKeyDecoratedValue( -// entityType, -// getDecoratorService(), -// getLocale()) ); } Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-04-03 14:03:20 UTC (rev 479) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-04-03 14:03:47 UTC (rev 480) @@ -43,3 +43,6 @@ echobase.importError.no.voyage.imported= echobase.importError.transect.notfound= echobase.importError.transit.notfound= +echobase.info.modifiedProperty=Property '%s', old value\: '%s', new value\: '%s' +echobase.info.onePropertyModified=One property was modified\: +echobase.info.somePropertiesModified=%s properties were modified\: Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-04-03 14:03:20 UTC (rev 479) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-04-03 14:03:47 UTC (rev 480) @@ -43,3 +43,7 @@ echobase.importError.no.voyage.imported=Aucun voyage importé echobase.importError.transect.notfound=Transit non trouvé pour la campagne %s et la date %s et le navire %s (ligne %s) echobase.importError.transit.notfound=Transit non trouvé pour la campagne %s et la date %s (ligne %s) +echobase.info.modifiedProperty=Propriété '%s', ancienne valeur \: '%s', nouvelle valeur \: '%s' +echobase.info.newEntityCreated=Une nouvelle entité a été créée %s +echobase.info.onePropertyModified=Une propriété a été modifiée \: +echobase.info.somePropertiesModified=%s propriétés ont été modifiées \: Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2012-04-03 14:03:20 UTC (rev 479) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/modificationLogs.jsp 2012-04-03 14:03:47 UTC (rev 480) @@ -32,10 +32,15 @@ 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'); @@ -71,7 +76,16 @@ <br/> <fieldset> <legend><s:text name="echobase.title.modification.detail"/></legend> - <pre id='modificationTextContainter'></pre> + <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>

1 0

r479 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 16:03:20 +0200 (Tue, 03 Apr 2012) New Revision: 479 Url: http://forge.codelutin.com/repositories/revision/echobase/479 Log: use topia api Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2012-04-03 14:01:26 UTC (rev 478) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2012-04-03 14:03:20 UTC (rev 479) @@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.struts2.json.JSONException; import org.apache.struts2.json.JSONUtil; -import org.nuiton.web.struts2.FilterPagerUtil; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import java.util.Collection; import java.util.Map; @@ -50,7 +50,8 @@ public abstract Integer getRecords(); - protected FilterPagerUtil.FilterPagerBean pager = new FilterPagerUtil.FilterPagerBean(); + protected TopiaFilterPagerUtil.FilterPagerBean pager = + new TopiaFilterPagerUtil.FilterPagerBean(); // sorting order - asc or desc protected String sord; @@ -140,7 +141,7 @@ Collection<Map<String, String>> rules = (Collection<Map<String, String>>) filterObject.get("rules"); - FilterPagerUtil.newFilterPagerBeanBuilder(groupOp). + TopiaFilterPagerUtil.newFilterPagerBeanBuilder(groupOp). addOperations(rules). flush(pager); } else { @@ -153,7 +154,7 @@ rule.put("op", searchOper); rule.put("field", searchField); rule.put("data", searchString); - FilterPagerUtil.newFilterPagerBeanBuilder("AND"). + TopiaFilterPagerUtil.newFilterPagerBeanBuilder("AND"). addRule(rule). flush(pager); }

1 0

r478 - trunk
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 16:01:26 +0200 (Tue, 03 Apr 2012) New Revision: 478 Url: http://forge.codelutin.com/repositories/revision/echobase/478 Log: fixes #1080: Updates to nuiton-utils 2.4.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-03 12:15:20 UTC (rev 477) +++ trunk/pom.xml 2012-04-03 14:01:26 UTC (rev 478) @@ -125,7 +125,7 @@ <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.9</topiaVersion> - <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.10</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion>

1 0

r477 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions/dbeditor resources/config webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 14:15:20 +0200 (Tue, 03 Apr 2012) New Revision: 477 Url: http://forge.codelutin.com/repositories/revision/echobase/477 Log: fixes #1077: Am?\195?\169liorer le message d'erreur lors d'un import ?\195?\169chou?\195?\169 Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2012-04-03 11:37:06 UTC (rev 476) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2012-04-03 12:15:20 UTC (rev 477) @@ -23,10 +23,10 @@ */ package fr.ifremer.echobase.ui.actions.dbeditor; -import com.google.common.base.Throwables; import com.opensymphony.xwork2.interceptor.annotations.InputConfig; import fr.ifremer.echobase.csv.CsvImportResult; import fr.ifremer.echobase.services.ImportService; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,6 +63,8 @@ /** CSV import result */ private CsvImportResult result; + private Exception error; + public CsvImportResult getResult() { return result; } @@ -100,6 +102,20 @@ this.createIfNotFound = createIfNotFound; } + public Exception getError() { + return error; + } + + public String getErrorStack() { + + String errorStack = null; + if (error != null) { + + errorStack = ExceptionUtils.getStackTrace(error); + } + return errorStack; + } + @Override public String input() throws Exception { load(); @@ -108,7 +124,6 @@ @Override @InputConfig(methodName = "input") - // to call input method on validation error to initialize dbeditor page public String execute() throws Exception { ImportService importService = newService(ImportService.class); @@ -121,11 +136,17 @@ getEchoBaseSession().getEchoBaseUser()); } catch (Exception eee) { - String message = "Failed to import datas : "; - log.error(message, eee); - addActionError(message + Throwables.getRootCause(eee).getMessage()); - return ERROR; + result = CsvImportResult.newResult(entityType, + importFileFileName, + false); + error = eee; + + addActionError(_("echobase.info.import.failed")); + + if (log.isErrorEnabled()) { + log.error("Error while import ", eee); + } } return SUCCESS; Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-04-03 11:37:06 UTC (rev 476) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-04-03 12:15:20 UTC (rev 477) @@ -78,7 +78,7 @@ <interceptor-ref name="prepareParamsStackLoggued"/> <result>/WEB-INF/jsp/dbeditor/csvImportResult.jsp</result> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> - <result name="error">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> +  </action>  Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp 2012-04-03 11:37:06 UTC (rev 476) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp 2012-04-03 12:15:20 UTC (rev 477) @@ -25,24 +25,40 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <title><s:text name="echobase.title.dbEditor"/></title> -<h2> - <s:text name="echobase.info.dbeditor.propertyDiffsResult"/> -</h2> +<fieldset> + <legend><s:text name="echobase.info.dbeditor.propertyDiffsResult"/></legend> -<fieldset> <s:label key="result.entityType" label="%{getText('echobase.common.entityType')}"/> <s:label key="result.importFileName" label="%{getText('echobase.label.importFile')}"/> - <s:label key="result.numberCreated" - label="%{getText('echobase.label.numberOfCreatedEntities')}"/> + <s:if test="hasActionErrors()"> + <s:label key="error.message" labelSeparator="" + label="%{getText('echobase.common.importError')}"/> + <%--div class="cleanBoth"> + <s:text name="echobase.common.importError"/> + <strong> + <s:property value="error.message"/> + </strong> + </div--%> + <pre id="errorStack"> + <code> + <s:property value="errorStack"/> + </code> + </pre> + </s:if> + <s:else> - <s:label key="result.numberUpdated" - label="%{getText('echobase.label.numberOfUpdatedEntities')}"/> + <s:label key="result.numberCreated" + label="%{getText('echobase.label.numberOfCreatedEntities')}"/> + + <s:label key="result.numberUpdated" + label="%{getText('echobase.label.numberOfUpdatedEntities')}"/> + </s:else> + </fieldset> - <s:a namespace="/dbeditor" action="dbeditor"> <s:param name="entityType" value="%{result.entityType}"/> <s:text name="echobase.action.return"/>

1 0

r476 - in trunk/echobase-ui/src/main/resources: . config
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:37:06 +0200 (Tue, 03 Apr 2012) New Revision: 476 Url: http://forge.codelutin.com/repositories/revision/echobase/476 Log: avoid to use a params-prepare-params stack Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml trunk/echobase-ui/src/main/resources/config/struts-importData.xml trunk/echobase-ui/src/main/resources/config/struts-importDb.xml trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -44,7 +44,7 @@  <action name="dbeditor" method="input" class="fr.ifremer.echobase.ui.actions.dbeditor.LoadEntities"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> </action> @@ -75,7 +75,7 @@  <action name="doImport" class="fr.ifremer.echobase.ui.actions.dbeditor.ImportTable"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result>/WEB-INF/jsp/dbeditor/csvImportResult.jsp</result> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> <result name="error">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> @@ -84,7 +84,7 @@  <action name="doExport" class="fr.ifremer.echobase.ui.actions.dbeditor.ExportTable"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -35,7 +35,7 @@  <action name="configure" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Configure"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input"> /WEB-INF/jsp/embeddedApplication/configure.jsp </result> @@ -58,7 +58,7 @@  <action name="download" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Download"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -33,7 +33,7 @@  <action name="configure" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/exportDb</param> @@ -54,7 +54,7 @@  <action name="download" class="fr.ifremer.echobase.ui.actions.exportDb.Download"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -41,6 +41,15 @@ </result-types> + <interceptors> +  + <interceptor-stack name="paramsPrepareParamsStackLoggued"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="paramsPrepareParamsStack"/> + </interceptor-stack> + </interceptors> +  <action name="manageExportQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -45,7 +45,7 @@  <action name="configure*-*" method="{2}" class="fr.ifremer.echobase.ui.actions.importData.Configure{1}Import"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importData/configure{1}Import.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> @@ -77,7 +77,7 @@  <action name="createMission" class="fr.ifremer.echobase.ui.actions.importData.CreateMission"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importData/createMission.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -33,7 +33,7 @@  <action name="configure" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/importDb</param> @@ -42,8 +42,7 @@ </action>  - <action name="import" - class="fr.ifremer.echobase.ui.actions.importDb.Import" + <action name="import" class="fr.ifremer.echobase.ui.actions.importDb.Import" method="execute"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="execAndWait"/> Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -64,7 +64,7 @@  <action name="user-*" class="fr.ifremer.echobase.ui.actions.user.{1}"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <interceptor-ref name="checkUserIsAdmin"/> <result name="input">/WEB-INF/jsp/user/{1}.jsp</result> <result>/WEB-INF/jsp/user/userList.jsp</result> Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/struts.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -114,13 +114,6 @@ <interceptor-ref name="defaultStack"/> </interceptor-stack> -  - <interceptor-stack name="paramsPrepareParamsStackLoggued"> - <interceptor-ref name="i18n"/> - <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="paramsPrepareParamsStack"/> - </interceptor-stack> - </interceptors>

1 0