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

r907 - in trunk/echobase-domain/src/main/java/fr/ifremer/echobase: entities/data entities/references persistence/migration/workingDb
by tchemit＠users.forge.codelutin.com 16 Dec '13

16 Dec '13

Author: tchemit Date: 2013-12-16 11:40:24 +0100 (Mon, 16 Dec 2013) New Revision: 907 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/907 Log: add more stuff on persistence (for topia 3 migration) Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryDAOImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadataImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellDAOImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryDAOImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryDAOImpl.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryDAOImpl.java 2013-12-16 10:40:24 UTC (rev 907) @@ -0,0 +1,51 @@ +package fr.ifremer.echobase.entities.data; + +/* + * #%L + * EchoBase :: Domain + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2013 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% + */ + +import fr.ifremer.echobase.EchoBaseTechnicalException; +import org.nuiton.topia.TopiaException; + +import java.util.List; + +public class CategoryDAOImpl<E extends Category> extends CategoryDAOAbstract<E> { + + public List<E> getCategoryUsingEchotype(Voyage voyage) throws TopiaException { + String hql = "SELECT DISTINCT c FROM VoyageImpl v, CategoryImpl c WHERE " + + "v = :voyage AND c.echotype in elements(v.echotype)"; + List<E> result = findAllByQuery(hql, "voyage", voyage); + return result; + } + + public long countCategoryUsingEchotype(Voyage voyage) { + String hql = "SELECT COUNT(DISTINCT c) FROM VoyageImpl v, CategoryImpl c WHERE " + + "v = :voyage AND c.echotype in elements(v.echotype)"; + try { + long result = countByQuery(hql, "voyage", voyage); + return result; + } catch (TopiaException e) { + throw new EchoBaseTechnicalException(e); + } + } + +} //CategoryDAOImpl<E extends Category> Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryDAOImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellDAOImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellDAOImpl.java 2013-12-12 14:36:49 UTC (rev 906) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellDAOImpl.java 2013-12-16 10:40:24 UTC (rev 907) @@ -26,6 +26,7 @@ import com.google.common.collect.Lists; import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.spatial.CellPoint; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaSQLQuery; import java.sql.Connection; @@ -51,19 +52,31 @@ return result; } -// public CellPoint getPoint(E cell) { -// -// TopiaSQLQuery<CellPoint> query = null; -// if (EchoBasePredicates.IS_ESDU_CELL.apply(cell)) { -// -// query = newLatLongSqlQuery(cell.getTopiaId(), null); -// } else if (EchoBasePredicates.IS_ELEMENTARY_CELL.apply(cell)) { -// query = newLatLongDepthSqlQuery(cell.getTopiaId(), null); -// } -// CellPoint result = query == null ? null : query.findSingleResult(context); -// return result; -// } + public long countVoyageOrphanCells(Voyage voyage) { + TopiaSQLQuery<Long> query = newCountVoyageOrphanCellsQuery(voyage); + Long result = query.findSingleResult(context); + return result; + } + public long countVoyageCellResults(Voyage voyage) { + TopiaSQLQuery<Long> query = newCountVoyageCellResultsQuery(voyage); + Long result = query.findSingleResult(context); + return result; + } + + public List<String> getVoyageCellIds() throws TopiaException { + TopiaSQLQuery<String> query = newVoyageCellIdsQuery(); + List<String> cellIds = query.findMultipleResult(context); + return cellIds; + } + + public List<String> getVoyageCellIds(Voyage voyage) throws TopiaException { + TopiaSQLQuery<String> query = newVoyageCellIdsQuery(voyage); + + List<String> cellIds = query.findMultipleResult(context); + return cellIds; + } + protected TopiaSQLQuery<CellPoint> newLatLongSqlQuery(final String voyageId, final String cellTypeId) { return new TopiaSQLQuery<CellPoint>() { @Override @@ -106,4 +119,100 @@ } }; } + + protected TopiaSQLQuery<Long> newCountVoyageOrphanCellsQuery(final Voyage voyage) { + return new TopiaSQLQuery<Long>() { + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + String hql = "SELECT count(c2.topiaid) FROM Transit ta, " + + " Transect te, " + + " DataAcquisition da, " + + " DataProcessing dp, " + + " Cell c, Cell c2 " + + "WHERE ta.voyage = ? " + + "AND ta.topiaId = te.transit " + + "AND te.topiaId = da.transect " + + "AND da.topiaId = dp.dataacquisition " + + "AND dp.topiaId = c.dataprocessing " + + "AND c.topiaId = c2.cell"; + PreparedStatement result = connection.prepareStatement(hql); + result.setString(1, voyage.getTopiaId()); + return result; + } + + @Override + protected Long prepareResult(ResultSet set) throws SQLException { + return set.getLong(1); + } + }; + } + + protected TopiaSQLQuery<Long> newCountVoyageCellResultsQuery(final Voyage voyage) { + return new TopiaSQLQuery<Long>() { + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + String hql = "SELECT count(c.topiaid) FROM Transit ta, " + + " Transect te, " + + " DataAcquisition da, " + + " DataProcessing dp, " + + " Cell c " + + "WHERE ta.voyage = ? " + + "AND ta.topiaId = te.transit " + + "AND te.topiaId = da.transect " + + "AND da.topiaId = dp.dataacquisition " + + "AND dp.topiaId = c.dataprocessing"; + PreparedStatement result = connection.prepareStatement(hql); + result.setString(1, voyage.getTopiaId()); + return result; + } + + @Override + protected Long prepareResult(ResultSet set) throws SQLException { + return set.getLong(1); + } + }; + } + + protected TopiaSQLQuery<String> newVoyageCellIdsQuery() { + return new TopiaSQLQuery<String>() { + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + String hql = "SELECT c.topiaid FROM Cell c " + + "WHERE c.cell IS NULL AND c.dataprocessing IS NULL AND c.voyage IS NULL"; + PreparedStatement result = connection.prepareStatement(hql); + return result; + } + + @Override + protected String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + }; + } + + protected TopiaSQLQuery<String> newVoyageCellIdsQuery(final Voyage voyage) { + return new TopiaSQLQuery<String>() { + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + String hql = "SELECT c.topiaid FROM Transit ta, " + + " Transect te, " + + " DataAcquisition da, " + + " DataProcessing dp, " + + " Cell c " + + "WHERE ta.voyage = ? " + + "AND ta.topiaId = te.transit " + + "AND te.topiaId = da.transect " + + "AND da.topiaId = dp.dataacquisition " + + "AND dp.topiaId = c.dataprocessing"; + PreparedStatement result = connection.prepareStatement(hql); + result.setString(1, voyage.getTopiaId()); + return result; + } + + @Override + protected String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + }; + } } Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java 2013-12-16 10:40:24 UTC (rev 907) @@ -0,0 +1,39 @@ +package fr.ifremer.echobase.entities.references; + +/* + * #%L + * EchoBase :: Domain + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2013 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% + */ + +public class CellTypeImpl extends CellTypeAbstract { + + public static final String MAP = "Map"; + + public static final String REGION_SURF = "RegionSURF"; + + public static final String REGION_CLAS = "RegionCLAS"; + + public static final String ELEMENTARY = "Elementary"; + + public static final String ESDU = "Esdu"; + + private static final long serialVersionUID = 3631136258339910497L; +} //CellTypeImpl Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadataImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadataImpl.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadataImpl.java 2013-12-16 10:40:24 UTC (rev 907) @@ -0,0 +1,46 @@ +package fr.ifremer.echobase.entities.references; + +/* + * #%L + * EchoBase :: Domain + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2013 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% + */ + +public class DataMetadataImpl extends DataMetadataAbstract { + + public static final String REGION_ENV_COORDINATES = "RegionEnvCoordinates"; + + public static final String SURFACE = "Surface"; + + public static final String GRID_CELL_LONGITUDE = "GridCellLongitude"; + + public static final String GRID_CELL_LATITUDE = "GridCellLatitude"; + + public static final String GRID_CELL_DEPTH = "GridCellDepth"; + + public static final String GRID_LONGITUDE_LAG = "GridLongitudeLag"; + + public static final String GRID_LATITUDE_LAG = "GridLatitudeLag"; + + public static final String GRID_DEPTH_LAG = "GridDepthLag"; + + private static final long serialVersionUID = 3487302769263981665L; + +} //DataMetadataImpl Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadataImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java 2013-12-16 10:40:24 UTC (rev 907) @@ -0,0 +1,43 @@ +package fr.ifremer.echobase.entities.references; + +/* + * #%L + * EchoBase :: Domain + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2011 - 2013 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% + */ + +public class SampleDataTypeImpl extends SampleDataTypeAbstract { + + public static final String MEAN_LENGTHCM = "MeanLengthcm"; + + public static final String MEAN_WEIGHTG = "MeanWeightg"; + + public static final String NO_PER_KG = "NoPerKg"; + + public static final String WEIGHT_AT_LENGTHKG = "WeightAtLengthkg"; + + public static final String L_TCM_1 = "LTcm1"; + + public static final String LTCM0_5 = "LTcm0.5"; + + public static final String NUMBER_AT_LENGTH = "NumberAtLength"; + + private static final long serialVersionUID = 3486460324380685111L; +} //SampleDataTypeImpl Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java 2013-12-12 14:36:49 UTC (rev 906) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java 2013-12-16 10:40:24 UTC (rev 907) @@ -12,12 +12,12 @@ * 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%

1 0

[ANN] - EchoBase 2.5 released
by forge.codelutin.com Release Notification 12 Dec '13

12 Dec '13

The EchoBase team is pleased to announce the echobase-2.5 release! The French Institute for the Exploitation of the Sea (Ifremer) has 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. Documentation of the project can be found here: http://maven-site.forge.codelutin.com/echobase Changes ------- Changes in this version include: New features: o Ajout de vues spatiales Issue: 3852. Thanks to Tony Chemit. Resolved by mdoray. o Ajout de vues spatiales pour les cellules Issue: 3672. Thanks to Tony Chemit. Resolved by mdoray. Fixed Bugs: o Impossible de modifier les données Issue: 3851. Thanks to Tony Chemit. Resolved by tchemit. o Problème de génération des données spatiales suite à un import de base. Issue: 3856. Thanks to Tony Chemit. Resolved by tchemit. o Erreur lors de la création d'une base embarquée Issue: 3776. Thanks to Mathieu Doray. Resolved by tchemit. o Pb export des données echobase Issue: 3680. Thanks to Mathieu Doray. Resolved by tchemit. o La colonne operationname n'est pas renseignée dans la table echobase_operation_spatial Issue: 3973. Thanks to Tony Chemit. Resolved by tchemit. Changes: o Updates mavenpom to 4.4 Issue: 3850. Thanks to Tony Chemit. Resolved by tchemit. o Intégrer les nouveaux icones Issue: 3954. Thanks to Tony Chemit. Resolved by tchemit. o Suppression du module echobase-tools Issue: 3974. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/echobase/files * echobase-embedded-2.5.zip - http://forge.codelutin.com/attachments/download/1297 * echobase-full-2.5.war - http://forge.codelutin.com/attachments/download/1298 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -EchoBase team

1 0

r906 - in trunk: . echobase-domain echobase-services echobase-ui
by tchemit＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: tchemit Date: 2013-12-12 15:36:49 +0100 (Thu, 12 Dec 2013) New Revision: 906 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/906 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2013-12-12 14:36:41 UTC (rev 905) +++ trunk/echobase-domain/pom.xml 2013-12-12 14:36:49 UTC (rev 906) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2013-12-12 14:36:41 UTC (rev 905) +++ trunk/echobase-services/pom.xml 2013-12-12 14:36:49 UTC (rev 906) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2013-12-12 14:36:41 UTC (rev 905) +++ trunk/echobase-ui/pom.xml 2013-12-12 14:36:49 UTC (rev 906) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 14:36:41 UTC (rev 905) +++ trunk/pom.xml 2013-12-12 14:36:49 UTC (rev 906) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> <modules> <module>echobase-domain</module> @@ -84,12 +84,12 @@ </developers> <scm> - <url>https://forge.codelutin.com/repositories/browse/echobase/tags/echobase-2.5</url> + <url>https://forge.codelutin.com/repositories/browse/echobase/trunk</url> <connection> - scm:svn:https://forge.codelutin.com/svn/echobase/tags/echobase-2.5 + scm:svn:https://forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:https://forge.codelutin.com/svn/echobase/tags/echobase-2.5 + scm:svn:https://forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r905 - tags
by tchemit＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: tchemit Date: 2013-12-12 15:36:41 +0100 (Thu, 12 Dec 2013) New Revision: 905 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/905 Log: [maven-release-plugin] copy for tag echobase-2.5 Added: tags/echobase-2.5/

1 0

r904 - in trunk: . echobase-domain echobase-services echobase-ui
by tchemit＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: tchemit Date: 2013-12-12 15:36:31 +0100 (Thu, 12 Dec 2013) New Revision: 904 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/904 Log: [maven-release-plugin] prepare release echobase-2.5 Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2013-12-12 14:27:43 UTC (rev 903) +++ trunk/echobase-domain/pom.xml 2013-12-12 14:36:31 UTC (rev 904) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2013-12-12 14:27:43 UTC (rev 903) +++ trunk/echobase-services/pom.xml 2013-12-12 14:36:31 UTC (rev 904) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2013-12-12 14:27:43 UTC (rev 903) +++ trunk/echobase-ui/pom.xml 2013-12-12 14:36:31 UTC (rev 904) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 14:27:43 UTC (rev 903) +++ trunk/pom.xml 2013-12-12 14:36:31 UTC (rev 904) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> <modules> <module>echobase-domain</module> @@ -84,12 +84,12 @@ </developers> <scm> - <url>https://forge.codelutin.com/repositories/browse/echobase/trunk</url> + <url>https://forge.codelutin.com/repositories/browse/echobase/tags/echobase-2.5</url> <connection> - scm:svn:https://forge.codelutin.com/svn/echobase/trunk + scm:svn:https://forge.codelutin.com/svn/echobase/tags/echobase-2.5 </connection> <developerConnection> - scm:svn:https://forge.codelutin.com/svn/echobase/trunk + scm:svn:https://forge.codelutin.com/svn/echobase/tags/echobase-2.5 </developerConnection> </scm>

1 0

r903 - trunk/echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: tchemit Date: 2013-12-12 15:27:43 +0100 (Thu, 12 Dec 2013) New Revision: 903 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/903 Log: fix i18n Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2013-12-12 14:23:53 UTC (rev 902) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2013-12-12 14:27:43 UTC (rev 903) @@ -266,10 +266,10 @@ echobase.info.no.workingDb.selected=No working database selected echobase.info.no.workingDbConfiguration.saved=No working database configuration saved echobase.info.no.workingDbConfiguration.selected=Select a working database configuration and then connect -echobase.info.query.cloned= -echobase.info.query.created= -echobase.info.query.removed= -echobase.info.query.saved= +echobase.info.query.cloned=Query cloned +echobase.info.query.created=Query created +echobase.info.query.removed=Query removed +echobase.info.query.saved=Query saved echobase.info.removeData.failed=Import removal failed echobase.info.removeData.succeded=Successful data import removal echobase.info.reportBug=Bug report

1 0

r902 - trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb
by tchemit＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: tchemit Date: 2013-12-12 15:23:53 +0100 (Thu, 12 Dec 2013) New Revision: 902 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/902 Log: fixes #3852: Ajout de vues spatiales Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java 2013-12-12 13:50:57 UTC (rev 901) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java 2013-12-12 14:23:53 UTC (rev 902) @@ -359,7 +359,8 @@ " (Select SUM(totalsamplemicrpou.sampleweight) From totalsamplemicrpou Where totalsamplemicrpou.operation_id = echobase_operation_spatial.operationname) as TotalCatchMICRPOU,\n" + " (Select SUM(totalsamplescomsco.sampleweight) From totalsamplescomsco Where totalsamplescomsco.operation_id = echobase_operation_spatial.operationname) as TotalCatchSCOMSCO,\n" + " (Select SUM(totalsampletractru.sampleweight) From totalsampletractru Where totalsampletractru.operation_id = echobase_operation_spatial.operationname) as TotalCatchTRACTRU,\n" + - " echobase_operation_spatial.operationid;"); + " echobase_operation_spatial.operationid\n" + + "From echobase_operation_spatial;"); queries.add("DROP VIEW IF EXISTS cellmapview;"); queries.add("CREATE OR REPLACE VIEW cellmapview AS \n" +

1 0

r901 - trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb
by tchemit＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: tchemit Date: 2013-12-12 14:50:57 +0100 (Thu, 12 Dec 2013) New Revision: 901 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/901 Log: fixes #3852: Ajout de vues spatiales Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java 2013-12-12 11:14:47 UTC (rev 900) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java 2013-12-12 13:50:57 UTC (rev 901) @@ -168,6 +168,7 @@ // add operation data view queries.add("DROP VIEW IF EXISTS TotalSampleEngrEnc;"); queries.add("CREATE OR REPLACE VIEW TotalSampleEngrEnc AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -178,13 +179,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM\n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -193,10 +194,11 @@ " speciescategory.sizecategory = sizecategory.topiaid AND\n" + " speciescategory.species = species.topiaid AND\n" + " sampletype.name = 'Total' AND\n" + - " species.baracoudacode='ENGR-ENC';"); + " species.baracoudacode='ENGR-ENC';\n"); queries.add("DROP VIEW IF EXISTS TotalSampleSardPil;"); queries.add("CREATE OR REPLACE VIEW TotalSampleSardPil AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -207,13 +209,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM \n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -226,6 +228,7 @@ queries.add("DROP VIEW IF EXISTS TotalSampleTracTru;"); queries.add("CREATE OR REPLACE VIEW TotalSampleTracTru AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -236,13 +239,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM \n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -255,6 +258,7 @@ queries.add("DROP VIEW IF EXISTS TotalSampleSpraSpr;"); queries.add("CREATE OR REPLACE VIEW TotalSampleSpraSpr AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -265,13 +269,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM \n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -284,6 +288,7 @@ queries.add("DROP VIEW IF EXISTS TotalSampleScomSco;"); queries.add("CREATE OR REPLACE VIEW TotalSampleScomSco AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -294,13 +299,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM \n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -313,6 +318,7 @@ queries.add("DROP VIEW IF EXISTS TotalSampleMicrPou;"); queries.add("CREATE OR REPLACE VIEW TotalSampleMicrPou AS\n" + + "\n" + "SELECT \n" + " echobase_operation_spatial.voyageid, \n" + " operation.id AS operation_id, \n" + @@ -323,13 +329,13 @@ " species.baracoudacode, \n" + " sample.topiaid\n" + "FROM \n" + - " echobase_operation_spatial, \n" + - " operation, \n" + - " sample, \n" + - " speciescategory, \n" + - " sizecategory, \n" + - " species, \n" + - " sampletype\n" + + " public.echobase_operation_spatial, \n" + + " public.operation, \n" + + " public.sample, \n" + + " public.speciescategory, \n" + + " public.sizecategory, \n" + + " public.species, \n" + + " public.sampletype\n" + "WHERE \n" + " echobase_operation_spatial.operationid = operation.topiaid AND\n" + " operation.topiaid = sample.operation AND\n" + @@ -342,6 +348,7 @@ queries.add("DROP VIEW IF EXISTS TotalCatchSpOpWide;"); queries.add("CREATE OR REPLACE VIEW TotalCatchSpOpWide AS\n" + + "\n" + "SELECT\n" + " echobase_operation_spatial.voyagename,\n" + " echobase_operation_spatial.operationname,\n" + @@ -351,8 +358,8 @@ " (Select SUM(totalsamplespraspr.sampleweight) From totalsamplespraspr Where totalsamplespraspr.operation_id = echobase_operation_spatial.operationname) as TotalCatchSPRASPR,\n" + " (Select SUM(totalsamplemicrpou.sampleweight) From totalsamplemicrpou Where totalsamplemicrpou.operation_id = echobase_operation_spatial.operationname) as TotalCatchMICRPOU,\n" + " (Select SUM(totalsamplescomsco.sampleweight) From totalsamplescomsco Where totalsamplescomsco.operation_id = echobase_operation_spatial.operationname) as TotalCatchSCOMSCO,\n" + - " (Select SUM(totalsampletractru.sampleweight) From totalsampletractru Where totalsampletractru.operation_id = echobase_operation_spatial.operationname) as TotalCatchTRACTRU\n" + - "From echobase_operation_spatial;"); + " (Select SUM(totalsampletractru.sampleweight) From totalsampletractru Where totalsampletractru.operation_id = echobase_operation_spatial.operationname) as TotalCatchTRACTRU,\n" + + " echobase_operation_spatial.operationid;"); queries.add("DROP VIEW IF EXISTS cellmapview;"); queries.add("CREATE OR REPLACE VIEW cellmapview AS \n" +

1 0

r900 - trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb
by tchemit＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: tchemit Date: 2013-12-12 12:14:47 +0100 (Thu, 12 Dec 2013) New Revision: 900 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/900 Log: fixes #3852: Ajout de vues spatiales Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java 2013-12-12 11:11:35 UTC (rev 899) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5.java 2013-12-12 11:14:47 UTC (rev 900) @@ -353,5 +353,11 @@ " (Select SUM(totalsamplescomsco.sampleweight) From totalsamplescomsco Where totalsamplescomsco.operation_id = echobase_operation_spatial.operationname) as TotalCatchSCOMSCO,\n" + " (Select SUM(totalsampletractru.sampleweight) From totalsampletractru Where totalsampletractru.operation_id = echobase_operation_spatial.operationname) as TotalCatchTRACTRU\n" + "From echobase_operation_spatial;"); + + queries.add("DROP VIEW IF EXISTS cellmapview;"); + queries.add("CREATE OR REPLACE VIEW cellmapview AS \n" + + " SELECT echobase_cell_spatial.voyagename, echobase_cell_spatial.coordinate, echobase_cell_spatial.shape, datametadata.name, result.resultvalue, species.baracoudacode, echobase_cell_spatial.cellname, result.topiaid AS resultid\n" + + " FROM echobase_cell_spatial, result, datametadata, category, speciescategory, species\n" + + " WHERE echobase_cell_spatial.cellid::text = result.cell::text AND result.datametadata::text = datametadata.topiaid::text AND result.category::text = category.topiaid::text AND category.speciescategory::text = speciescategory.topiaid::text AND speciescategory.species::text = species.topiaid::text AND echobase_cell_spatial.celltypename::text = 'Map cell'::text;"); } }

1 0

r899 - trunk/src/site/rst
by tchemit＠users.forge.codelutin.com 12 Dec '13

12 Dec '13

Author: tchemit Date: 2013-12-12 12:11:35 +0100 (Thu, 12 Dec 2013) New Revision: 899 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/899 Log: update doc Modified: trunk/src/site/rst/install.rst.vm Modified: trunk/src/site/rst/install.rst.vm =================================================================== --- trunk/src/site/rst/install.rst.vm 2013-12-12 10:28:48 UTC (rev 898) +++ trunk/src/site/rst/install.rst.vm 2013-12-12 11:11:35 UTC (rev 899) @@ -92,8 +92,8 @@ Pré-requis: -- Avoir installer tomcat 7 -- Etre loggué sur une console avec l'utilisateur root. +- Avoir installé tomcat 7 +- Être loggué sur une console avec l'utilisateur root. On suppose que tomcat a été installé via le système de paquets, et donc que le répertoire **/var/lib/tomcat7** existe. @@ -107,14 +107,14 @@ mkdir /var/local/echobase mkdir /var/local/echobase/war -- Placer le war à utiliser dans **/var/local/echobase/war** -- Ajouter une lien symoblique vers le war à utiliser +- Placer le war *echobase-full-${project.version}.war* à utiliser dans **/var/local/echobase/war** +- Ajouter un lien symoblique vers le war à utiliser :: - ln -s /var/local/echobase/war/echobase-full-${project.version}.var /var/local/echobase/echobase.war + ln -s /var/local/echobase/war/echobase-full-${project.version}.war /var/local/echobase/echobase.war -- Mettre l'application dans tomcat +- Ajouter l'application dans tomcat :: @@ -142,7 +142,7 @@ | `-- echobase.log |-- echobase.war `-- war - `-- echobase-full-2.3-SNAPSHOT.war + `-- echobase-full-${project.version}-SNAPSHOT.war Mettre à jour le war de l'application @@ -150,8 +150,8 @@ Pré-requis : -- Avoir installer tomcat 7 -- Etre loggué sur une console avec l'utilisateur root. +- Avoir installé tomcat 7 +- Être loggué sur une console avec l'utilisateur root. On suppose que tomcat a été installé via le système de paquets, et donc que le répertoire **/var/lib/tomcat7** existe. @@ -167,13 +167,13 @@ - Attendre que le répertoire **/var/lib/tomcat7/webapps/echobase** a bien été supprimé. -- Copier le nouveau war dans **/var/local/echobase/war** +- Placer le war *echobase-full-${project.version}.war* à utiliser dans **/var/local/echobase/war** - Changer le lien symbolique **/var/local/echobase/echobase.war** :: - unlink echobase.war - ln -s /var/local/echobasewar/echobase-full-${project.version}.war /var/local/echobase/echobase.war + unlink /var/local/echobase/echobase.war + ln -s /var/local/echobase/war/echobase-full-${project.version}.war /var/local/echobase/echobase.war - Mettre l'application dans tomcat

1 0