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

r185 - in trunk: . echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com 14 Dec '11

14 Dec '11

Author: tchemit Date: 2011-12-14 08:14:58 +0100 (Wed, 14 Dec 2011) New Revision: 185 Url: http://forge.codelutin.com/repositories/revision/echobase/185 Log: fix dependencies Modified: trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2011-12-13 17:23:10 UTC (rev 184) +++ trunk/echobase-tools/pom.xml 2011-12-14 07:14:58 UTC (rev 185) @@ -38,9 +38,11 @@ <version>${project.version}</version> </dependency> +  + <dependency> - <groupId>fr.ird</groupId> - <artifactId>msaccess-importer</artifactId> + <groupId>com.healthmarketscience.jackcess</groupId> + <artifactId>jackcess</artifactId> </dependency>  @@ -70,16 +72,6 @@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> @@ -106,13 +98,13 @@  <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <artifactId>nuiton-csv</artifactId> </dependency> <dependency> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-12-13 17:23:10 UTC (rev 184) +++ trunk/echobase-ui/pom.xml 2011-12-14 07:14:58 UTC (rev 185) @@ -34,11 +34,6 @@ </dependency> <dependency> - <groupId>fr.ird</groupId> - <artifactId>msaccess-importer</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-struts2</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-13 17:23:10 UTC (rev 184) +++ trunk/pom.xml 2011-12-14 07:14:58 UTC (rev 185) @@ -119,6 +119,7 @@ <postgresqlVersion>9.1-901.jdbc4</postgresqlVersion> <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>7.5.3.v20111011</jettyVersion> + <jackcessVersion>1.2.0</jackcessVersion>   @@ -140,11 +141,11 @@ <dependencyManagement> <dependencies> +  <dependency> - <groupId>fr.ird</groupId> - <artifactId>msaccess-importer</artifactId> - <version>${msaccessImporterVersion}</version> - <scope>compile</scope> + <groupId>com.healthmarketscience.jackcess</groupId> + <artifactId>jackcess</artifactId> + <version>${jackcessVersion}</version> </dependency>  @@ -238,7 +239,6 @@ </dependency>  - <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId>

1 0

r184 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor
by tchemit＠users.forge.codelutin.com 13 Dec '11

13 Dec '11

Author: tchemit Date: 2011-12-13 18:23:10 +0100 (Tue, 13 Dec 2011) New Revision: 184 Url: http://forge.codelutin.com/repositories/revision/echobase/184 Log: fix topiaid when save entity Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2011-12-13 17:21:48 UTC (rev 183) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2011-12-13 17:23:10 UTC (rev 184) @@ -42,7 +42,7 @@ private static final long serialVersionUID = 1L; /** Logger. */ - private static final Log log = LogFactory.getLog(ImportTable.class); + private static final Log log = LogFactory.getLog(GetEntities.class); /** Type of entity to load. */ protected EchoBaseEntityEnum entityType; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2011-12-13 17:21:48 UTC (rev 183) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2011-12-13 17:23:10 UTC (rev 184) @@ -49,7 +49,7 @@ protected EchoBaseEntityEnum entityType; /** id of entity to save. */ - protected String id; + protected String topiaId; /** Metas of the table */ protected TableMeta tableMeta; @@ -64,8 +64,8 @@ this.entityType = entityType; } - public void setId(String id) { - this.id = id; + public void setTopiaId(String topiaId) { + this.topiaId = topiaId; } @Override @@ -93,7 +93,7 @@ } } } - properties.put(TopiaEntity.TOPIA_ID, id); + properties.put(TopiaEntity.TOPIA_ID, topiaId); service.saveEntity(tableMeta, properties,

1 0

r183 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com 13 Dec '11

13 Dec '11

Author: tchemit Date: 2011-12-13 18:21:48 +0100 (Tue, 13 Dec 2011) New Revision: 183 Url: http://forge.codelutin.com/repositories/revision/echobase/183 Log: fix conflict with id property Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-12-13 17:21:22 UTC (rev 182) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-12-13 17:21:48 UTC (rev 183) @@ -255,6 +255,11 @@ formatter='formatEntityLabel' sortable="true"/> </s:if> + <s:elseif test="#meta.name == 'id'"> + <sjg:gridColumn name="ID" + title="id" + sortable="true" editable="true"/> + </s:elseif> <s:else> <sjg:gridColumn name="%{#meta.name}" title="%{#meta.name}" @@ -287,7 +292,7 @@ <s:hidden key="entityType" label=''/> - <s:hidden id="id" name='id' label=''/> + <s:hidden id="topiaId" name='topiaId' label=''/> <s:iterator value="columnMetas" var="meta" status="status"> <s:set var="metaName" value='%{#meta.name}'/>

1 0

r182 - trunk/echobase-ui/src/main/webapp/WEB-INF/includes
by tchemit＠users.forge.codelutin.com 13 Dec '11

13 Dec '11

Author: tchemit Date: 2011-12-13 18:21:22 +0100 (Tue, 13 Dec 2011) New Revision: 182 Url: http://forge.codelutin.com/repositories/revision/echobase/182 Log: only admin can load a full db 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 2011-12-13 17:20:56 UTC (rev 181) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2011-12-13 17:21:22 UTC (rev 182) @@ -54,10 +54,12 @@ </div> <div class="cleanBoth"> <ul> + <s:if test="%{userIsAdmin}"> <li> <s:a action="configureImport" namespace="/importDb" method="input"> <s:text name="echobase.menu.importDb"/></s:a> </li> + </s:if> <li> <s:a action="configureMission" namespace="/importData" method="input"> <s:text name="echobase.menu.importData"/></s:a>

1 0

r181 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 13 Dec '11

13 Dec '11

Author: tchemit Date: 2011-12-13 18:20:56 +0100 (Tue, 13 Dec 2011) New Revision: 181 Url: http://forge.codelutin.com/repositories/revision/echobase/181 Log: fix loadRow when property is id (avoid conflict with topiaId) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportExportService.java 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 2011-12-13 17:19:39 UTC (rev 180) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2011-12-13 17:20:56 UTC (rev 181) @@ -106,7 +106,28 @@ String sidx, Boolean ascendantOrder) { - return getDatas(entityType, pager, sidx, ascendantOrder, true); + TableMeta meta = getTableMeta(entityType); + + List<TopiaEntity> entities = getEntities(meta, + pager, + sidx, + ascendantOrder, + null + ); + + Map<?, ?>[] rows = new Map[entities.size()]; + + ImportExportModel<TopiaEntity> model = buildForLoad(meta, "id", true); + + int i = 0; + for (Object o : entities) { + TopiaEntity entity = (TopiaEntity) o; + Map<String, Object> row = loadRow(entity, model); + rows[i++] = row; + } + return rows; + +// return getDatas(entityType, pager, sidx, ascendantOrder, true); } @@ -169,41 +190,13 @@ } } - public Map<?, ?>[] getDatas(EchoBaseEntityEnum entityType, - Pager pager, - String sidx, - Boolean ascendantOrder, - boolean addDecorated) { - - TableMeta meta = getTableMeta(entityType); - - List<TopiaEntity> entities = getEntities(meta, - pager, - sidx, - ascendantOrder, - null - ); - - Map<?, ?>[] rows = new Map[entities.size()]; - - ImportExportModel<TopiaEntity> model = buildForLoad(meta, addDecorated); - - int i = 0; - for (Object o : entities) { - TopiaEntity entity = (TopiaEntity) o; - Map<String, Object> row = loadRow(entity, model); - rows[i++] = row; - } - return rows; - } - public Map<?, ?> getData(TableMeta tableMeta, String topiaId) { EchoBaseEntityEnum entityEnum = tableMeta.getSource(); try { TopiaDAO<?> dao = getDAO(entityEnum.getContract()); TopiaEntity entity = dao.findByTopiaId(topiaId); - ImportExportModel<TopiaEntity> model = buildForLoad(tableMeta, true); + ImportExportModel<TopiaEntity> model = buildForLoad(tableMeta, TopiaEntity.TOPIA_ID, true); return loadRow(entity, model); } catch (TopiaException eee) { throw new EchoBaseTechnicalException("Could not obtain data", eee); @@ -497,9 +490,17 @@ } catch (Exception eee) { throw new EchoBaseTechnicalException( "Could not obtain property [" + propertyName + - "] value ", eee); + "] value from entity " + entity.getTopiaId(), eee); } - String formatedValue = column.formatValue(value); + String formatedValue; + try { + formatedValue = column.formatValue(value); + } catch (Exception eee) { + throw new EchoBaseTechnicalException( + "Could not format property [" + propertyName + + "] from value [" + value + + "] from entity " + entity.getTopiaId(), eee); + } row.put(propertyName, formatedValue); } @@ -607,12 +608,13 @@ } protected <E extends TopiaEntity> ImportExportModel<E> buildForLoad(TableMeta meta, + String idName, boolean addDecorated) { EntityCsvModel<E> model = EntityCsvModel.newModel( getConfiguration().getCsvSeparator(), meta, - "id" + idName ); for (ColumnMeta columnMeta : meta) { @@ -638,6 +640,18 @@ ); } + } else if ("id".equals(propertyName)) { + + if ("id".equals(idName)) { + + // there will be a conflict with this meta, rename it to ID + model.addDefaultColumn("ID", propertyName, type); + } else { + + // no id conflict + model.addDefaultColumn(propertyName, type); + + } } else { model.addDefaultColumn(propertyName, type); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportExportService.java 2011-12-13 17:19:39 UTC (rev 180) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbImportExportService.java 2011-12-13 17:20:56 UTC (rev 181) @@ -31,6 +31,7 @@ import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EntitiesUtil; +import fr.ifremer.echobase.entities.EntityModificationLog; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.MetaFilenameAware; import fr.ifremer.echobase.entities.meta.TableMeta; @@ -76,8 +77,9 @@ * @param model model of the db import operation * @param user user which perform the import * @throws IOException if any io exception while import + * @throws TopiaException if any pb while topia treatment */ - public void importDb(ImportDbConfiguration model, EchoBaseUser user) throws IOException { + public void importDb(ImportDbConfiguration model, EchoBaseUser user) throws IOException, TopiaException { File file = model.getInput().getFile(); @@ -143,6 +145,16 @@ if (log.isInfoEnabled()) { log.info("Import done with user " + user.getEmail()); } + TopiaDAO<EntityModificationLog> dao = + getDAO(EntityModificationLog.class); + + dao.create( + EntityModificationLog.PROPERTY_ENTITY_TYPE, "import db", + EntityModificationLog.PROPERTY_ENTITY_ID, "Complete db", + EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), + EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), + EntityModificationLog.PROPERTY_MODIFICATION_TEXT, "import db from file " + file + ); commitTransaction("Could not commit db import from file " + file); } finally { zipFile.close(); @@ -300,20 +312,20 @@ } try { - EchoBaseEntityEnum sourceType = meta.getSource(); + EchoBaseEntityEnum sourceType = meta.getSource(); // EchoBaseEntityEnum targetType = meta.getTarget(); - Import<E> importer = Import.newImport(csvModel, reader); + Import<E> importer = Import.newImport(csvModel, reader); TopiaDAO<E> sourceDAO = getDAO(sourceType); // TopiaDAO<TopiaEntity> targetDAO = getDAO(targetType); - List<E> sourceEntities = getEntities(sourceType); - Map<String, E> sourcesById = - Maps.uniqueIndex(sourceEntities, EchoBaseFunctions.TO_TOPIAID); - try { - for (E row : importer) { - E entityToSave = sourcesById.get(row.getTopiaId()); - Collection<TopiaEntity> assoc = meta.getChilds(row); - meta.setChilds(entityToSave, assoc); + List<E> sourceEntities = getEntities(sourceType); + Map<String, E> sourcesById = + Maps.uniqueIndex(sourceEntities, EchoBaseFunctions.TO_TOPIAID); + try { + for (E row : importer) { + E entityToSave = sourcesById.get(row.getTopiaId()); + Collection<TopiaEntity> assoc = meta.getChilds(row); + meta.setChilds(entityToSave, assoc); // sourceDAO.update(entityToSave); // E entityToSave = sourceDAO.findByTopiaId(row.getTopiaId()); @@ -335,13 +347,13 @@ // result.incrementsNumberUpdated(); // } // meta.setChilds(entityToSave, associationToSave); + } + } finally { + + importer.close(); } - } finally { - importer.close(); - } - - commitTransaction("Could not commit transaction"); + commitTransaction("Could not commit transaction"); } catch (TopiaException eee) { throw new EchoBaseTechnicalException(eee); }

1 0

r180 - trunk
by tchemit＠users.forge.codelutin.com 13 Dec '11

13 Dec '11

Author: tchemit Date: 2011-12-13 18:19:39 +0100 (Tue, 13 Dec 2011) New Revision: 180 Url: http://forge.codelutin.com/repositories/revision/echobase/180 Log: upgrade pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-13 16:08:03 UTC (rev 179) +++ trunk/pom.xml 2011-12-13 17:19:39 UTC (rev 180) @@ -112,9 +112,9 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.8</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.2.3.1</struts2Version> + <struts2Version>2.3.1</struts2Version> <jqueryPluginVersion>3.2.0</jqueryPluginVersion> - <seleniumVersion>2.14.0</seleniumVersion> + <seleniumVersion>2.15.0</seleniumVersion> <h2Version>1.3.162</h2Version> <postgresqlVersion>9.1-901.jdbc4</postgresqlVersion> <slf4jVersion>1.6.4</slf4jVersion>

1 0

r179 - tags
by maven-release＠users.forge.codelutin.com 13 Dec '11

13 Dec '11

Author: maven-release Date: 2011-12-13 17:08:03 +0100 (Tue, 13 Dec 2011) New Revision: 179 Url: http://forge.codelutin.com/repositories/revision/echobase/179 Log: add echobase initial data zip Added: tags/echobase-0.2-2011-12-13.zip Added: tags/echobase-0.2-2011-12-13.zip =================================================================== (Binary files differ) Property changes on: tags/echobase-0.2-2011-12-13.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r178 - in trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools: . loaders
by tchemit＠users.forge.codelutin.com 13 Dec '11

13 Dec '11

Author: tchemit Date: 2011-12-13 16:49:27 +0100 (Tue, 13 Dec 2011) New Revision: 178 Url: http://forge.codelutin.com/repositories/revision/echobase/178 Log: make test works or not if src/test/private/csv does or not exist Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2011-12-13 15:30:52 UTC (rev 177) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2011-12-13 15:49:27 UTC (rev 178) @@ -76,6 +76,10 @@ @BeforeClass public static void beforeClass() { + + // check /csv dir is available in test resources + TestHelper.assertCsvResourceDirectoryExists(); + configuration = new EchoBaseConfiguration("echobase-test.properties"); } Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java 2011-12-13 15:30:52 UTC (rev 177) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseDbZipCreatorIT.java 2011-12-13 15:49:27 UTC (rev 178) @@ -55,11 +55,12 @@ File distributionFile = new File(exportdir, "echobase.zip"); Assert.assertFalse(distributionFile.exists()); - File basedir = TestHelper.getBasedir(); - File sourceDir = FileUtil.getFileFromFQN(basedir, "src.main.resources.csv"); + File sourceDir = TestHelper.getCsvResourceDirectory(); + new EchoBaseDbCreator().createEchoBaseDb(sourceDir, dir, distributionFile); Assert.assertTrue(distributionFile.exists()); } + } Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java 2011-12-13 15:30:52 UTC (rev 177) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/EchoBaseMSAccessToCsvIT.java 2011-12-13 15:49:27 UTC (rev 178) @@ -51,12 +51,11 @@ @Test public void exportMSAccessToCsv() throws Exception { - msAccessFile = FileUtil.getFileFromPaths(TestHelper.getBasedir(), - "src", - "test", - "private", - "baracouda.mdb" - ); + File privateDir = FileUtil.getFileFromFQN(TestHelper.getBasedir(), + "src.test.private"); + + msAccessFile = new File(privateDir, "baracouda.mdb"); + if (!msAccessFile.exists()) { if (log.isWarnEnabled()) { log.warn("Could not find " + msAccessFile + Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2011-12-13 15:30:52 UTC (rev 177) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2011-12-13 15:49:27 UTC (rev 178) @@ -27,6 +27,9 @@ import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assume; import org.junit.Ignore; import org.junit.rules.TestName; import org.nuiton.topia.TopiaContext; @@ -49,6 +52,9 @@ protected static File basedir; + /** Logger. */ + private static final Log log = LogFactory.getLog(TestHelper.class); + protected static final long timestamp = System.currentTimeMillis(); public static File getBasedir() { @@ -62,6 +68,22 @@ return basedir; } + public static void assertCsvResourceDirectoryExists() { + File sourceDir = getCsvResourceDirectory(); + if (!sourceDir.exists()) { + if (log.isWarnEnabled()) { + log.warn("Could not find " + sourceDir + ", will skip some tests..."); + } + } + Assume.assumeTrue(sourceDir.exists()); + } + + public static File getCsvResourceDirectory() { + File basedir = getBasedir(); + File sourceDir = FileUtil.getFileFromFQN(basedir, "src.test.private.echobase.csv"); + return sourceDir; + } + public static File getTestBasedir(Class<?> testClass) { File result = new File(FileUtils.getTempDirectory(), testClass.getName() + "_" + timestamp); return result; Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java 2011-12-13 15:30:52 UTC (rev 177) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/VoyageLoaderTest.java 2011-12-13 15:49:27 UTC (rev 178) @@ -53,15 +53,19 @@ generateBaracoudaEntities(); } + Set<MetaFilenameAware> dones; + @Override protected void loadDependencies(Set<MetaFilenameAware> dones) throws IOException, TopiaException { super.loadDependencies(dones); - loadDependencies(EchoBaseEntityEnum.Voyage, dones); + this.dones = dones; } @Test public void testGenerateEchotypeAssociation() throws Exception { + loadDependencies(EchoBaseEntityEnum.Voyage, dones); + AssociationMeta associationMeta = loader.getMeta().getAssociations(Voyage.PROPERTY_ECHOTYPE);

1 0

r177 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-tools echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com 13 Dec '11

13 Dec '11

Author: tchemit Date: 2011-12-13 16:30:52 +0100 (Tue, 13 Dec 2011) New Revision: 177 Url: http://forge.codelutin.com/repositories/revision/echobase/177 Log: fix decorator fix foreign key name add tools test dir (only if present on FS) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java trunk/echobase-tools/pom.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2011-12-13 15:28:43 UTC (rev 176) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2011-12-13 15:30:52 UTC (rev 177) @@ -258,7 +258,7 @@ registerJXPathDecorator(locale, MeasureType.class, "${name}$s"); // Mission decorator - registerJXPathDecorator(locale, Mission.class, "${missionName}$s"); + registerJXPathDecorator(locale, Mission.class, "${name}$s"); // Moment decorator registerJXPathDecorator(locale, Moment.class, "${name}$s"); Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2011-12-13 15:28:43 UTC (rev 176) +++ trunk/echobase-tools/pom.xml 2011-12-13 15:30:52 UTC (rev 177) @@ -213,6 +213,26 @@ </plugins> </build> </profile> + + <profile> + <activation> + <file> + <exists>src/test/private/echobase</exists> + </file> + </activation> + <id>echobase-csv-inputs</id> + <build> + <testResources> + <testResource> + <directory>src/test/private/echobase</directory> + <includes> + <include>**/*.csv</include> + </includes> + </testResource> + </testResources> + </build> + </profile> + </profiles> </project> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-12-13 15:28:43 UTC (rev 176) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-12-13 15:30:52 UTC (rev 177) @@ -251,7 +251,7 @@ <s:if test="#meta.fK"> <sjg:gridColumn name="%{#meta.name}" - title="%{getText(#meta.i18nKey)}" + title="%{#meta.name}" formatter='formatEntityLabel' sortable="true"/> </s:if>

1 0

r176 - trunk/echobase-tools/src/main/resources
by maven-release＠users.forge.codelutin.com 13 Dec '11

13 Dec '11

Author: maven-release Date: 2011-12-13 16:28:43 +0100 (Tue, 13 Dec 2011) New Revision: 176 Url: http://forge.codelutin.com/repositories/revision/echobase/176 Log: remove csv import files Removed: trunk/echobase-tools/src/main/resources/csv/

1 0