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

r275 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/configurations echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders
by tchemit＠users.forge.codelutin.com Jan. 13, 2012

Jan. 13, 2012

Author: tchemit Date: 2012-01-13 18:06:50 +0100 (Fri, 13 Jan 2012) New Revision: 275 Url: http://forge.codelutin.com/repositories/revision/echobase/275 Log: fix sonar errors Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java 2012-01-13 15:49:20 UTC (rev 274) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java 2012-01-13 17:06:50 UTC (rev 275) @@ -27,6 +27,7 @@ import java.io.File; import java.io.IOException; +import java.util.Arrays; /** * Configuration of a embedded application creation. @@ -82,7 +83,7 @@ } public void setVoyageIds(String[] voyageIds) { - this.voyageIds = voyageIds; + this.voyageIds = Arrays.copyOf(voyageIds, voyageIds.length); } public File getWarLocation() { Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java 2012-01-13 15:49:20 UTC (rev 274) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java 2012-01-13 17:06:50 UTC (rev 275) @@ -90,7 +90,7 @@ /** Logger. */ private static final Log log = LogFactory.getLog(CellLoader.class); - public static final DateFormat DATE_FORMAT = + public final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss'Z'"); public static final String SURF_REGION = "SURF"; @@ -461,7 +461,7 @@ // already treated continue; } - String cellStringId = DATE_FORMAT.format(cellId); + String cellStringId = dateFormat.format(cellId); if (log.isDebugEnabled()) { log.debug("Treat esdu " + cellStringId); } @@ -493,7 +493,7 @@ continue; } - String cellStringId = DATE_FORMAT.format(cellId); + String cellStringId = dateFormat.format(cellId); if (log.isDebugEnabled()) { log.debug("Treat esdu " + cellStringId); } Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-13 15:49:20 UTC (rev 274) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-13 17:06:50 UTC (rev 275) @@ -64,6 +64,7 @@ import java.io.Reader; import java.io.Writer; import java.text.ParseException; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Set; @@ -127,7 +128,8 @@ this.fileTypes = Sets.newHashSet(fileTypes); this.parent = parent; this.parentAssociationName = parentAssociationName; - this.extraDependencies = extraDependencies; + Preconditions.checkNotNull(extraDependencies); + this.extraDependencies = Arrays.copyOf(extraDependencies, extraDependencies.length); } @Override

1 0

r274 - trunk
by tchemit＠users.forge.codelutin.com Jan. 13, 2012

Jan. 13, 2012

Author: tchemit Date: 2012-01-13 16:49:20 +0100 (Fri, 13 Jan 2012) New Revision: 274 Url: http://forge.codelutin.com/repositories/revision/echobase/274 Log: updates plugins and dev Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-13 10:45:03 UTC (rev 273) +++ trunk/pom.xml 2012-01-13 15:49:20 UTC (rev 274) @@ -79,7 +79,8 @@ <scm> <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + <connection> + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk @@ -107,21 +108,21 @@  <eugenePluginVersion>2.4.2</eugenePluginVersion> - <topiaVersion>2.6.5</topiaVersion> - <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> + <topiaVersion>2.6.6</topiaVersion> + <nuitonUtilsVersion>2.4.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.9.1</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <struts2Version>2.3.1.1</struts2Version> <jqueryPluginVersion>3.2.1</jqueryPluginVersion> - <seleniumVersion>2.15.0</seleniumVersion> - <h2Version>1.3.162</h2Version> - <postgresqlVersion>9.1-901.jdbc4</postgresqlVersion> + <seleniumVersion>2.16.1</seleniumVersion> + <h2Version>1.3.163</h2Version> + <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <slf4jVersion>1.6.4</slf4jVersion> - <jettyVersion>7.5.3.v20111011</jettyVersion> - <jackcessVersion>1.2.0</jackcessVersion> +  + <jackcessVersion>1.2.6</jackcessVersion>  -  + <jettyVersion>8.1.0.RC2</jettyVersion> <hibernateVersion>3.6.9.Final</hibernateVersion> @@ -308,7 +309,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>10.0.1</version> + <version>11.0.1</version> </dependency> <dependency> @@ -432,10 +433,11 @@ <version>${nuitonI18nVersion}</version> </plugin> +  <plugin> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </plugin> </plugins>

1 0

r273 - trunk/echobase-ui
by tchemit＠users.forge.codelutin.com Jan. 13, 2012

Jan. 13, 2012

Author: tchemit Date: 2012-01-13 11:45:03 +0100 (Fri, 13 Jan 2012) New Revision: 273 Url: http://forge.codelutin.com/repositories/revision/echobase/273 Log: add auto-deploy profile (last try...) Modified: trunk/echobase-ui/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-01-13 10:40:13 UTC (rev 272) +++ trunk/echobase-ui/pom.xml 2012-01-13 10:45:03 UTC (rev 273) @@ -454,7 +454,7 @@ <configuration> <repositoryId>demo.codelutin.com</repositoryId> <repositoryUrl>scpexe://demo.codelutin.com</repositoryUrl> - <command>( cd var/local/echobase ; ./deploy.sh ${project.version} )</command> + <command>( cd /var/local/echobase ; ./deploy.sh ${project.version} )</command> </configuration> </execution> </executions>

1 0

r272 - trunk/echobase-ui
by tchemit＠users.forge.codelutin.com Jan. 13, 2012

Jan. 13, 2012

Author: tchemit Date: 2012-01-13 11:40:13 +0100 (Fri, 13 Jan 2012) New Revision: 272 Url: http://forge.codelutin.com/repositories/revision/echobase/272 Log: add auto-deploy profile Modified: trunk/echobase-ui/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-01-13 10:27:11 UTC (rev 271) +++ trunk/echobase-ui/pom.xml 2012-01-13 10:40:13 UTC (rev 272) @@ -452,8 +452,8 @@ <goal>execute-remote-command</goal> </goals> <configuration> - <serverId>demo.codelutin.com</serverId> - <url>scpexe://demo.codelutin.com/var/local/echobase/war</url> + <repositoryId>demo.codelutin.com</repositoryId> + <repositoryUrl>scpexe://demo.codelutin.com</repositoryUrl> <command>( cd var/local/echobase ; ./deploy.sh ${project.version} )</command> </configuration> </execution>

1 0

r271 - in trunk: . echobase-ui
by tchemit＠users.forge.codelutin.com Jan. 13, 2012

Jan. 13, 2012

Author: tchemit Date: 2012-01-13 11:27:11 +0100 (Fri, 13 Jan 2012) New Revision: 271 Url: http://forge.codelutin.com/repositories/revision/echobase/271 Log: add auto-deploy profile Modified: trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-01-13 10:26:52 UTC (rev 270) +++ trunk/echobase-ui/pom.xml 2012-01-13 10:27:11 UTC (rev 271) @@ -429,7 +429,7 @@ <artifactId>wagon-maven-plugin</artifactId> <executions> <execution> - <phase>integration-test</phase> + <phase>verify</phase> <goals> <goal>upload-single</goal> </goals> @@ -441,6 +441,24 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>execute-remote-command</goal> + </goals> + <configuration> + <serverId>demo.codelutin.com</serverId> + <url>scpexe://demo.codelutin.com/var/local/echobase/war</url> + <command>( cd var/local/echobase ; ./deploy.sh ${project.version} )</command> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </profile> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-13 10:26:52 UTC (rev 270) +++ trunk/pom.xml 2012-01-13 10:27:11 UTC (rev 271) @@ -432,6 +432,12 @@ <version>${nuitonI18nVersion}</version> </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>1.4-SNAPSHOT</version> + </plugin> + </plugins> </pluginManagement>

1 0

r270 - trunk/echobase-entities/src/main/xmi
by tchemit＠users.forge.codelutin.com Jan. 13, 2012

Jan. 13, 2012

Author: tchemit Date: 2012-01-13 11:26:52 +0100 (Fri, 13 Jan 2012) New Revision: 270 Url: http://forge.codelutin.com/repositories/revision/echobase/270 Log: modify model Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)

1 0

r269 - in trunk: . echobase-ui
by tchemit＠users.forge.codelutin.com Jan. 13, 2012

Jan. 13, 2012

Author: tchemit Date: 2012-01-13 10:46:23 +0100 (Fri, 13 Jan 2012) New Revision: 269 Url: http://forge.codelutin.com/repositories/revision/echobase/269 Log: add demo deploy profile Modified: trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-01-13 09:46:10 UTC (rev 268) +++ trunk/echobase-ui/pom.xml 2012-01-13 09:46:23 UTC (rev 269) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -92,7 +94,7 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-runner</artifactId> </dependency> - + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -416,5 +418,32 @@ </profile> + <profile> + <id>deploy-to-demo</id> + <build> + + <defaultGoal>verify</defaultGoal> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>demo.codelutin.com</serverId> + <fromFile>target/${project.build.finalName}.war</fromFile> + <url>scpexe://demo.codelutin.com/var/local/echobase/war</url> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-13 09:46:10 UTC (rev 268) +++ trunk/pom.xml 2012-01-13 09:46:23 UTC (rev 269) @@ -123,7 +123,9 @@   - <hibernateVersion>3.6.8.Final</hibernateVersion> + <hibernateVersion>3.6.9.Final</hibernateVersion> + + <wagonPluginVersion>1.0-beta-3</wagonPluginVersion> <googleSearchEnabled>true</googleSearchEnabled>  @@ -413,6 +415,12 @@ </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <version>${wagonPluginVersion}</version> + </plugin> + + <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <version>${eugenePluginVersion}</version>

1 0

r268 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com Jan. 13, 2012

Jan. 13, 2012

Author: tchemit Date: 2012-01-13 10:46:10 +0100 (Fri, 13 Jan 2012) New Revision: 268 Url: http://forge.codelutin.com/repositories/revision/echobase/268 Log: reformat jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 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-01-12 18:00:45 UTC (rev 267) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp 2012-01-13 09:46:10 UTC (rev 268) @@ -26,7 +26,7 @@ <title><s:text name="echobase.title.dbEditor"/></title> <h2> - <s:text name="echobase.info.dbeditor.propertyDiffsResult"/> + <s:text name="echobase.info.dbeditor.propertyDiffsResult"/> </h2> <fieldset> @@ -44,6 +44,6 @@ </fieldset> <s:a namespace="/dbeditor" action="dbeditor"> - <s:param name="entityType" value="%{result.entityType}"/> - <s:text name="echobase.action.return"/> + <s:param name="entityType" value="%{result.entityType}"/> + <s:text name="echobase.action.return"/> </s:a> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-01-12 18:00:45 UTC (rev 267) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-01-13 09:46:10 UTC (rev 268) @@ -41,36 +41,36 @@ // Hack to make name=id on sj tags var combos = $('select[name=""]'); - combos.each(function(obj) { - this.name = this.id; + combos.each(function (obj) { + this.name = this.id; }); var pickers = $('input.hasDatepicker'); - pickers.each(function(obj) { - this.name = this.id; + pickers.each(function (obj) { + this.name = this.id; }); // on table name change, let's reload reload this page - $('[name="entityType"]').change(function(event) { + $('[name="entityType"]').change(function (event) { var url = "${reloadUrl}?" + $.param({entityType:this.value}); window.location = url; }); // on reset let's just reload the selected row - $('[name="resetAction"]').click(function(event){ + $('[name="resetAction"]').click(function (event) { $.publish('datas-rowSelect') }); // on grid selected clear, let's remove the edit form - $.addClearSelectTopic('datas', function(event) { + $.addClearSelectTopic('datas', function (event) { $('#noRowSelected').show(); $('#editForm').hide(); }); // on row selection, let's load the edit form - $.addRowSelectTopic('datas', function(event) { - + $.addRowSelectTopic('datas', function (event) { + $('#noRowSelected').hide(); $('#editForm').show(); @@ -82,14 +82,14 @@ // get entity value from json jQuery.getJSON("${getTableData}", - { "entityType":entityType, "id":id }, function (result) { + { "entityType":entityType, "id":id }, function (result) { // get metadatas from the response var metas = result.metas; // iterate on result to push in form the value to edit - $.each(result.datas, function(propertyName, value) { + $.each(result.datas, function (propertyName, value) { if (propertyName == 'topiaId') { @@ -123,7 +123,7 @@ switch (type) { case 'boolean': case 'Boolean': - editor.attr('checked', value=="Y"?true:false); + editor.attr('checked', value == "Y" ? true : false); break; case 'Date': @@ -151,84 +151,84 @@ function updateDate(value, editor) { - // parse date formated like : dd/MM/yyyy HH:mm:ss - var date = parseDate(value); + // parse date formated like : dd/MM/yyyy HH:mm:ss + var date = parseDate(value); - // get timePicker instance - var inst = $.datepicker._getInst(editor[0]); + // get timePicker instance + var inst = $.datepicker._getInst(editor[0]); - // set date - $.datepicker._setDate(inst, date); + // set date + $.datepicker._setDate(inst, date); - // set time - $.datepicker._setTime(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("/"); + // 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 hourString = value.substring(11, 19); + var hourSplited = hourString.split(":"); - var day = parseInt(dateSplited[0]); + var day = parseInt(dateSplited[0]); - // 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]); + // 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); + // update date + // TODO sletellier 20111122 : edit milliseconds ? + return new Date(year, month, day, hour, minute, second, 0); } </script> <s:select key="entityType" label='%{getText("echobase.common.entityType")}' - list="entityTypes" headerKey="" headerValue=""/> + list="entityTypes" headerKey="" headerValue=""/> <br class="clearBoth"/> <s:if test="tableSelected"> - <sj:tabbedpanel id="io" collapsible="true"> - <sj:tab id="tab_importForm" target="importForm" title="ss" - label="%{getText('echobase.title.importTable')}"/> + <sj:tabbedpanel id="io" collapsible="true"> + <sj:tab id="tab_importForm" target="importForm" title="ss" + label="%{getText('echobase.title.importTable')}"/> - <sj:tab id="tab_exportForm" target="exportForm" - label="%{getText('echobase.title.exportTable')}"/> + <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:form id="importForm" namespace="/dbeditor" method="post" + enctype="multipart/form-data"> - <s:hidden key="entityType" label=''/> - <s:file key="importFile" required="true" - label="%{getText('echobase.label.importFile')}"/> + <s:hidden key="entityType" label=''/> + <s:file key="importFile" required="true" + label="%{getText('echobase.label.importFile')}"/> - <s:checkbox key='createIfNotFound' value='true' - label='%{getText("echobase.label.createIfNotFound")}'/> - <br/> - <s:submit key="echobase.action.importTable" action="doImport" - align="right"/> - </s:form> + <s:checkbox key='createIfNotFound' value='true' + label='%{getText("echobase.label.createIfNotFound")}'/> + <br/> + <s:submit key="echobase.action.importTable" action="doImport" + align="right"/> + </s:form> - <s:form id="exportForm" namespace="/dbeditor" method="post"> - <s:hidden key="entityType" label=''/> - <s:textfield key="exportFileName" required="true" size="100" - label="%{getText('echobase.label.exportFileName')}"/> + <s:form id="exportForm" namespace="/dbeditor" method="post"> + <s:hidden key="entityType" label=''/> + <s:textfield key="exportFileName" required="true" size="100" + label="%{getText('echobase.label.exportFileName')}"/> - <br/> - <s:submit key="echobase.action.exportTable" action="doExport" - align="right"/> - </s:form> + <br/> + <s:submit key="echobase.action.exportTable" action="doExport" + align="right"/> + </s:form> - </sj:tabbedpanel> + </sj:tabbedpanel> - </s:if> +</s:if> <br class="clearBoth"/> <s:if test="tableSelected"> @@ -281,10 +281,10 @@ <fieldset id="noRowSelected"> <legend> - <s:text name="echobase.legend.dbeditor.edit"> - <s:param value="%{tableI18nName}"/> - </s:text> - </legend> + <s:text name="echobase.legend.dbeditor.edit"> + <s:param value="%{tableI18nName}"/> + </s:text> + </legend> <i><s:text name="echobase.message.no.row.selected"/>.</i> </fieldset> @@ -299,14 +299,14 @@ <s:hidden key="entityType" label=''/> <s:hidden id="topiaId" name='topiaId' label=''/> - + <s:iterator value="columnMetas" var="meta" status="status"> <s:set var="metaName" value='%{#meta.name}'/> <s:if test="#meta.fK"> <s:url id="urlName" - action="getForeignEntities" - namespace="/dbeditor" - escapeAmp="false"> + action="getForeignEntities" + namespace="/dbeditor" + escapeAmp="false"> <s:param name="entityType" value="%{#meta.typeSimpleName}"/> </s:url> <sj:select id="%{#metaName}" @@ -316,28 +316,28 @@ emptyOption="true"/> </s:if> <s:else> - <s:if test='#meta.columnType == "string"'> - <s:textfield id="%{#metaName}" + <s:if test='#meta.columnType == "string"'> + <s:textfield id="%{#metaName}" + name="%{#metaName}" + label="%{#metaName}" + disabled="%{#meta.fK}" + value=""/> + </s:if> + <s:elseif test='#meta.columnType == "boolean"'> + <s:checkbox id="%{#metaName}" + name="%{#metaName}" + label="%{#metaName}" value="%{false}"/> + </s:elseif> + <s:elseif test='#meta.columnType == "date"'> + <sj:datepicker id="%{#metaName}" name="%{#metaName}" label="%{#metaName}" - disabled="%{#meta.fK}" - value=""/> - </s:if> - <s:elseif test='#meta.columnType == "boolean"'> - <s:checkbox id="%{#metaName}" - name="%{#metaName}" - label="%{#metaName}" value="%{false}"/> - </s:elseif> - <s:elseif test='#meta.columnType == "date"'> - <sj:datepicker id="%{#metaName}" - name="%{#metaName}" - label="%{#metaName}" - value="%{new java.util.Date()}" - displayFormat="dd/mm/yy" - timepicker="true" - timepickerShowSecond="true" - timepickerFormat="hh:mm:ss"/> - </s:elseif> + value="%{new java.util.Date()}" + displayFormat="dd/mm/yy" + timepicker="true" + timepickerShowSecond="true" + timepickerFormat="hh:mm:ss"/> + </s:elseif> </s:else> <br/> </s:iterator>

1 0

r267 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com Jan. 12, 2012

Jan. 12, 2012

Author: tchemit Date: 2012-01-12 19:00:45 +0100 (Thu, 12 Jan 2012) New Revision: 267 Url: http://forge.codelutin.com/repositories/revision/echobase/267 Log: Anomalie #722: L'import gloabale de la base ne charge pas les associations *-* Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-12 16:44:40 UTC (rev 266) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-12 18:00:45 UTC (rev 267) @@ -244,6 +244,16 @@ } } + protected String getNormalizedTableName(String table1, String table2) { + String result; + if (table1.compareTo(table2) > 0) { + result = table2 + "_" + table1; + } else { + result = table1 + "_" + table2; + } + return result; + } + protected void importAssociationfile(AssociationMeta meta, ImportToMap importer, CsvImportResult csvResult) throws TopiaException { @@ -258,12 +268,11 @@ String sourceTableName = source.getContract().getSimpleName(); String table = targetTableName; if (source == EchoBaseEntityEnum.Voyage && target == EchoBaseEntityEnum.Echotype || - source == EchoBaseEntityEnum.Echotype && target == EchoBaseEntityEnum.Species) { - table = sourceTableName + "_" + targetTableName; - updateString = "UPDATE " + table + " SET " + sourceTableName + " = '%s' WHERE " + meta.getName() + " ='%s';"; - } else if (source == EchoBaseEntityEnum.Voyage && target == EchoBaseEntityEnum.Strata) { - table = targetTableName + "_" + source.getContract().getSimpleName(); - updateString = "UPDATE " + table + " SET " + sourceTableName + " = '%s' WHERE " + meta.getName() + " ='%s';"; + source == EchoBaseEntityEnum.Echotype && target == EchoBaseEntityEnum.Species || + source == EchoBaseEntityEnum.Voyage && target == EchoBaseEntityEnum.Strata) { + // relation *-* + table = getNormalizedTableName(sourceTableName, targetTableName); + updateString = "INSERT INTO " + table + " (" + sourceTableName + "," + targetTableName + ") VALUES('%s','%s');"; } else { updateString = "UPDATE " + table + " SET " + sourceTableName + " = '%s' WHERE topiaId ='%s';"; }

1 0

r266 - trunk/echobase-entities/src/main/xmi
by tchemit＠users.forge.codelutin.com Jan. 12, 2012

Jan. 12, 2012

Author: tchemit Date: 2012-01-12 17:44:40 +0100 (Thu, 12 Jan 2012) New Revision: 266 Url: http://forge.codelutin.com/repositories/revision/echobase/266 Log: finish TSParameters Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)

1 0