Echobase-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
February 2014
- 5 participants
- 46 discussions
r957 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/config echobase-ui/src/main/webapp/WEB-INF/jsp src/site/en/rst src/site/rst
by tchemit@users.forge.codelutin.com 27 Feb '14
by tchemit@users.forge.codelutin.com 27 Feb '14
27 Feb '14
Author: tchemit
Date: 2014-02-27 16:52:37 +0100 (Thu, 27 Feb 2014)
New Revision: 957
Url: http://codelutin.com/projects/echobase/repository/revisions/957
Log:
refs #4558: Updates mavenpom to 5.0 (utilisation nouvelles urls)
Modified:
trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java
trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp
trunk/src/site/en/rst/model.rst
trunk/src/site/rst/model.rst
Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java
===================================================================
--- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java 2014-02-27 15:25:52 UTC (rev 956)
+++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java 2014-02-27 15:52:37 UTC (rev 957)
@@ -76,7 +76,7 @@
File.class),
DOCUMENTATION_URL("echobase.documentationUrl",
n("echobase.config.documentationUrl.description"),
- "http://maven-site.forge.codelutin.com/echobase",
+ "http://doc.codelutin.com/echobase",
URL.class);
/** Configuration key. */
Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2014-02-27 15:25:52 UTC (rev 956)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2014-02-27 15:52:37 UTC (rev 957)
@@ -43,7 +43,7 @@
</s:a>
</li>
<li>
- <s:a href="http://svn.forge.codelutin.com/svn/echobase/R-EchoBase/" target='#doc'>
+ <s:a href="http://svn.codelutin.com/echobase/R-EchoBase/" target='#doc'>
<s:text name="echobase.info.REchoBase"/>
</s:a>
</li>
Modified: trunk/src/site/en/rst/model.rst
===================================================================
--- trunk/src/site/en/rst/model.rst 2014-02-27 15:25:52 UTC (rev 956)
+++ trunk/src/site/en/rst/model.rst 2014-02-27 15:52:37 UTC (rev 957)
@@ -40,8 +40,13 @@
On donne ici des explications sur le modèle.
-Le modèle conçu sous argoUML est téléchargeable `ici`_ .
+Téléchargement
+==============
+- `Télécharger le modèle au format argoUML`_.
+
+- `Télécharger le modèle au format freeMind`_.
+
Modèle du référentiel
---------------------
@@ -76,7 +81,8 @@
- `Sous modèle pêcherie`_
-.. _ici: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-domain/src/main/…
+.. _Télécharger le modèle au format argoUML: http://svn.codelutin.com/echobase/trunk/echobase-domain/src/main/xmi/echoba…
+.. _Télécharger le modèle au format freeMind: http://svn.codelutin.com/echobase/trunk/src/doc/model/EchoBase_structure_V5…
.. _Vue générale du référentiel: model/referenceAll.png
.. _Référentiel AcousticInstrument: model/referenceAcousticInstrument.png
Modified: trunk/src/site/rst/model.rst
===================================================================
--- trunk/src/site/rst/model.rst 2014-02-27 15:25:52 UTC (rev 956)
+++ trunk/src/site/rst/model.rst 2014-02-27 15:52:37 UTC (rev 957)
@@ -72,8 +72,8 @@
- `Sous modèle pêcherie`_
-.. _Télécharger le modèle au format argoUML: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-domain/src/main/…
-.. _Télécharger le modèle au format freeMind: http://svn.forge.codelutin.com/svn/echobase/trunk/src/doc/model/EchoBase_st…
+.. _Télécharger le modèle au format argoUML: http://svn.codelutin.com/echobase/trunk/echobase-domain/src/main/xmi/echoba…
+.. _Télécharger le modèle au format freeMind: http://svn.codelutin.com/echobase/trunk/src/doc/model/EchoBase_structure_V5…
.. _Vue générale du référentiel: model/referenceAll.png
.. _Référentiel AcousticInstrument: model/referenceAcousticInstrument.png
1
0
Author: tchemit
Date: 2014-02-27 16:25:52 +0100 (Thu, 27 Feb 2014)
New Revision: 956
Url: http://codelutin.com/projects/echobase/repository/revisions/956
Log:
>From scmwebeditor -- refs #4575 (mod?\195?\168le non accessible)
Modified:
trunk/src/site/en/rst/model.rst
Modified: trunk/src/site/en/rst/model.rst
===================================================================
--- trunk/src/site/en/rst/model.rst 2014-02-27 15:24:26 UTC (rev 955)
+++ trunk/src/site/en/rst/model.rst 2014-02-27 15:25:52 UTC (rev 956)
@@ -76,7 +76,7 @@
- `Sous modèle pêcherie`_
-.. _ici: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-entities/src/mai…
+.. _ici: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-domain/src/main/…
.. _Vue générale du référentiel: model/referenceAll.png
.. _Référentiel AcousticInstrument: model/referenceAcousticInstrument.png
1
0
Author: tchemit
Date: 2014-02-27 16:24:26 +0100 (Thu, 27 Feb 2014)
New Revision: 955
Url: http://codelutin.com/projects/echobase/repository/revisions/955
Log:
>From scmwebeditor -- refs #4575 (mod?\195?\168le non accessible)
Modified:
trunk/src/site/rst/model.rst
Modified: trunk/src/site/rst/model.rst
===================================================================
--- trunk/src/site/rst/model.rst 2014-02-27 15:03:00 UTC (rev 954)
+++ trunk/src/site/rst/model.rst 2014-02-27 15:24:26 UTC (rev 955)
@@ -72,7 +72,7 @@
- `Sous modèle pêcherie`_
-.. _Télécharger le modèle au format argoUML: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-entities/src/mai…
+.. _Télécharger le modèle au format argoUML: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-domain/src/main/…
.. _Télécharger le modèle au format freeMind: http://svn.forge.codelutin.com/svn/echobase/trunk/src/doc/model/EchoBase_st…
.. _Vue générale du référentiel: model/referenceAll.png
1
0
r954 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb echobase-domain/src/main/resources/META-INF/services echobase-domain/src/main/resources/migration echobase-domain/src/main/xmi echobase-services/src/main/resources
by tchemit@users.forge.codelutin.com 27 Feb '14
by tchemit@users.forge.codelutin.com 27 Feb '14
27 Feb '14
Author: tchemit
Date: 2014-02-27 16:03:00 +0100 (Thu, 27 Feb 2014)
New Revision: 954
Url: http://codelutin.com/projects/echobase/repository/revisions/954
Log:
refs #4194: Visualisation des donn?\195?\169es spatiales
Added:
trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java
trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql
Modified:
trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion
trunk/echobase-domain/src/main/xmi/echobase.properties
trunk/echobase-services/src/main/resources/postgis-view.sql
Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java
===================================================================
--- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java (rev 0)
+++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java 2014-02-27 15:03:00 UTC (rev 954)
@@ -0,0 +1,43 @@
+package fr.ifremer.echobase.persistence.migration.workingDb;
+
+import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext;
+import fr.ifremer.echobase.io.EchoBaseIOUtil;
+import org.nuiton.topia.persistence.TopiaException;
+import org.nuiton.util.Version;
+
+import java.util.List;
+
+/**
+ * Created on 2/26/14.
+ *
+ * @author Tony Chemit <chemit(a)codelutin.com>
+ * @since 2.6
+ */
+public class MigrationCallBackForVersion2_6 extends MigrationCallBackForVersion {
+
+ public static final String POSTGIS_VIEW_SQL = "/migration/postgis-view-2.6.sql";
+
+ @Override
+ public Version getVersion() {
+ return new Version("2.6");
+ }
+
+ @Override
+ protected void prepareMigrationScript(EchoBaseUserTopiaPersistenceContext tx,
+ List<String> queries,
+ boolean showSql,
+ boolean showProgression) throws TopiaException {
+
+ boolean spatialAware = tx.isSpatialAware();
+
+ if (spatialAware) {
+
+ // repass postgis scripts (http://forge.codelutin.com/issues/4018)
+ updatePostgis(queries);
+ }
+ }
+
+ protected void updatePostgis(List<String> queries) {
+ queries.add(EchoBaseIOUtil.loadScript(POSTGIS_VIEW_SQL));
+ }
+}
\ No newline at end of file
Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion
===================================================================
--- trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion 2014-02-25 17:06:08 UTC (rev 953)
+++ trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion 2014-02-27 15:03:00 UTC (rev 954)
@@ -1,2 +1,3 @@
fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_2
-fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_5_1
\ No newline at end of file
+fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_5_1
+fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_6
\ No newline at end of file
Added: trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql
===================================================================
--- trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql (rev 0)
+++ trunk/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql 2014-02-27 15:03:00 UTC (rev 954)
@@ -0,0 +1,452 @@
+-----------------------------------------------------------------------------------------------------------------------
+---- DROP EXISTING VIEW - INDEX - FUNCTION - TRIGGER ------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
+DROP VIEW IF EXISTS echobase_cell_spatial_result CASCADE;
+DROP VIEW IF EXISTS cellmapview CASCADE;
+
+DROP VIEW IF EXISTS echobase_cell_spatial_data CASCADE ;
+DROP VIEW IF EXISTS meanMapcellBiomassEngrEnc CASCADE;
+DROP VIEW IF EXISTS meanMapcellBiomassSardPil CASCADE;
+DROP VIEW IF EXISTS meanMapcellBiomassTracTru CASCADE;
+DROP VIEW IF EXISTS meanMapcellBiomassSpraSpr CASCADE;
+DROP VIEW IF EXISTS meanMapcellBiomassScomSco CASCADE;
+DROP VIEW IF EXISTS meanMapcellBiomassMicrPou CASCADE;
+DROP VIEW IF EXISTS TotalCatchSpOpWide CASCADE;
+DROP VIEW IF EXISTS TotalSampleEngrEnc CASCADE;
+DROP VIEW IF EXISTS TotalSampleSardPil CASCADE;
+DROP VIEW IF EXISTS TotalSampleTracTru CASCADE;
+DROP VIEW IF EXISTS TotalSampleSpraSpr CASCADE;
+DROP VIEW IF EXISTS TotalSampleScomSco CASCADE;
+DROP VIEW IF EXISTS TotalSampleMicrPou CASCADE;
+
+DROP INDEX IF EXISTS cellEsduViewSpeciesBiomass_uidx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewSpeciesAbundance_uidx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewSpeciesMeanLength_uidx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewEchotypeNasc_uidx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewEchotype_idx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewSpecies_idx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewSpeciesResultGrouped_idx CASCADE;
+DROP INDEX IF EXISTS cellmapview_idx CASCADE;
+DROP INDEX IF EXISTS cellmapview_uidx CASCADE;
+DROP INDEX IF EXISTS TotalSampleView_idx CASCADE;
+
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewEchotypeNasc CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewSpeciesBiomass CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewSpeciesAbundance CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewSpeciesMeanLength CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewEchotype CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewSpeciesResultGrouped CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewSpecies CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellmapview CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS TotalSampleView CASCADE;
+
+DROP TRIGGER IF EXISTS echobase_refresh_views_trigger ON entitymodificationlog CASCADE;
+DROP FUNCTION IF EXISTS echobase_to_numeric(string VARCHAR) CASCADE;
+DROP FUNCTION IF EXISTS echobase_refresh_views() CASCADE;
+
+-----------------------------------------------------------------------------------------------------------------------
+---- CREATE FUNCTION - TRIGGER ----------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION echobase_to_numeric(string VARCHAR)
+ RETURNS REAL AS $$
+BEGIN
+ RETURN string::real;
+ EXCEPTION WHEN invalid_text_representation
+ THEN
+ RETURN NULL;
+END
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION echobase_refresh_views()
+ RETURNS TRIGGER AS $$
+DECLARE
+ operationtype VARCHAR;
+ result RECORD;
+BEGIN
+
+ IF (TG_OP = 'DELETE')
+ THEN
+ result = OLD;
+ ELSE
+ result = NEW;
+ END IF;
+
+ operationtype = result.entitytype;
+
+ IF (operationtype ILIKE '%Import%' OR operationtype ILIKE '%Removed%')
+ THEN
+ -- Can update views
+ RAISE NOTICE 'reload cellEsduViewEchotype';
+ REFRESH MATERIALIZED VIEW cellEsduViewEchotype;
+ REINDEX INDEX cellEsduViewEchotype_idx;
+
+ RAISE NOTICE 'reload cellEsduViewSpecies';
+ REFRESH MATERIALIZED VIEW cellEsduViewSpecies;
+ REINDEX INDEX cellEsduViewSpecies_idx;
+
+ RAISE NOTICE 'reload cellEsduViewSpeciesResultGrouped';
+ REFRESH MATERIALIZED VIEW cellEsduViewSpeciesResultGrouped;
+ REINDEX INDEX cellEsduViewSpeciesResultGrouped_idx;
+
+ RAISE NOTICE 'reload cellEsduViewEchotypeNasc';
+ REFRESH MATERIALIZED VIEW cellEsduViewEchotypeNasc;
+
+ RAISE NOTICE 'reload cellEsduViewSpeciesBiomass';
+ REFRESH MATERIALIZED VIEW cellEsduViewSpeciesBiomass;
+ REINDEX INDEX cellEsduViewSpeciesBiomass_uidx;
+
+ RAISE NOTICE 'reload cellEsduViewSpeciesAbundance';
+ REFRESH MATERIALIZED VIEW cellEsduViewSpeciesAbundance;
+ REINDEX INDEX cellEsduViewSpeciesAbundance_uidx;
+
+ RAISE NOTICE 'reload cellEsduViewSpeciesMeanLength';
+ REFRESH MATERIALIZED VIEW cellEsduViewSpeciesMeanLength;
+ REINDEX INDEX cellEsduViewSpeciesMeanLength_uidx;
+
+ RAISE NOTICE 'reload cellmapview';
+ REFRESH MATERIALIZED VIEW cellmapview;
+ REINDEX INDEX cellmapview_idx;
+ REINDEX INDEX cellmapview_uidx;
+ END IF;
+
+ RETURN result;
+END
+$$
+LANGUAGE 'plpgsql';
+
+CREATE TRIGGER echobase_refresh_views_trigger
+AFTER INSERT OR UPDATE ON entitymodificationlog
+EXECUTE PROCEDURE echobase_refresh_views();
+
+-----------------------------------------------------------------------------------------------------------------------
+---- CELL RESULT VIEW -------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
+CREATE MATERIALIZED VIEW cellEsduViewEchotype AS
+ SELECT
+ c.voyagename,
+ c.coordinate,
+ c.shape,
+ c.cellname,
+ d.name,
+ echobase_to_numeric(r.resultvalue) as resultvalue,
+ e.name as echotypeName,
+ e.meaning as echotypeMeaning,
+ r.topiaid AS resultid
+ FROM
+ echobase_cell_spatial c,
+ result r,
+ datametadata d,
+ category cat,
+ echotype e
+ WHERE
+ c.cellid = r.cell
+ AND r.datametadata = d.topiaid
+ AND r.category = cat.topiaid
+ AND cat.echotype IS NOT NULL
+ AND cat.echotype = e.topiaid
+ AND c.celltypename = 'Elementary Distance Sampling Unit';
+
+CREATE INDEX cellEsduViewEchotype_idx ON cellEsduViewEchotype(name);
+
+CREATE MATERIALIZED VIEW cellEsduViewEchotypeNasc AS
+ SELECT
+ *
+ FROM
+ cellEsduViewEchotype v
+ WHERE
+ v.name = 'NASC';
+
+CREATE UNIQUE INDEX cellEsduViewEchotypeNasc_uidx ON cellEsduViewEchotypeNasc(resultid);
+
+CREATE MATERIALIZED VIEW cellEsduViewSpecies AS
+ SELECT
+ c.voyagename,
+ c.coordinate,
+ c.shape,
+ c.cellname,
+ d.name,
+ echobase_to_numeric(r.resultvalue) as resultvalue,
+ s.baracoudacode,
+ r.topiaid AS resultid
+ FROM
+ echobase_cell_spatial c,
+ result r,
+ datametadata d,
+ category cat,
+ speciescategory scat,
+ species s
+ WHERE
+ c.cellid = r.cell
+ AND r.datametadata = d.topiaid
+ AND r.category = cat.topiaid
+ AND cat.speciescategory IS NOT NULL
+ AND cat.speciescategory = scat.topiaid
+ AND scat.species = s.topiaid
+ AND c.celltypename = 'Elementary Distance Sampling Unit';
+
+CREATE INDEX cellEsduViewSpecies_idx ON cellEsduViewSpecies(name);
+
+CREATE MATERIALIZED VIEW cellEsduViewSpeciesResultGrouped AS
+ SELECT
+ count(*) AS nbResults,
+ name,
+ cellname,
+ baracoudacode,
+ sum(resultvalue) as resultvalue,
+ cellname || '-' || baracoudacode || '-' || name as id
+ FROM cellEsduViewSpecies
+ WHERE
+ baracoudacode in ('ENGR-ENC', 'SARD-PIL', 'TRAC-TRU', 'SPRA-SPR', 'SCOM-SCO', 'MICR-POU')
+ AND name in ('Biomass','Abundance','MeanLength')
+ GROUP BY baracoudacode, cellname, name;
+
+CREATE INDEX cellEsduViewSpeciesResultGrouped_idx ON cellEsduViewSpecies(baracoudacode, cellname, name);
+
+CREATE MATERIALIZED VIEW cellEsduViewSpeciesBiomass AS
+ SELECT
+ distinct v2.coordinate,
+ v2.voyagename,
+ v.*
+ FROM
+ cellEsduViewSpeciesResultGrouped v
+ JOIN cellEsduViewSpecies v2 USING (name, baracoudacode, cellname)
+ WHERE
+ v.name = 'Biomass';
+
+CREATE UNIQUE INDEX cellEsduViewSpeciesBiomass_uidx ON cellEsduViewSpeciesBiomass(id);
+
+CREATE MATERIALIZED VIEW cellEsduViewSpeciesAbundance AS
+ SELECT
+ distinct v2.coordinate,
+ v2.voyagename,
+ v.*
+ FROM
+ cellEsduViewSpeciesResultGrouped v
+ JOIN cellEsduViewSpecies v2 USING (name, baracoudacode, cellname)
+ WHERE
+ v.name = 'Abundance';
+
+CREATE UNIQUE INDEX cellEsduViewSpeciesAbundance_uidx ON cellEsduViewSpeciesAbundance(id);
+
+CREATE MATERIALIZED VIEW cellEsduViewSpeciesMeanLength AS
+ SELECT
+ distinct v2.coordinate,
+ v2.voyagename,
+ v.*
+ FROM
+ cellEsduViewSpeciesResultGrouped v
+ JOIN cellEsduViewSpecies v2 USING (name, baracoudacode, cellname)
+ WHERE
+ v.name = 'MeanLength';
+
+CREATE UNIQUE INDEX cellEsduViewSpeciesMeanLength_uidx ON cellEsduViewSpeciesMeanLength(id);
+
+-----------------------------------------------------------------------------------------------------------------------
+---- CELL DATA VIEW ---------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
+CREATE OR REPLACE VIEW echobase_cell_spatial_data AS
+ SELECT
+ s.*,
+ m.topiaId AS metaDataId,
+ m.name AS metaDataName,
+ d.datavalue AS dataValue,
+ d.topiaid AS dataId
+ FROM
+ echobase_cell_spatial s,
+ data d,
+ datametadata m
+ WHERE
+ s.cellid = d.cell AND
+ d.datametadata = m.topiaid;
+
+-----------------------------------------------------------------------------------------------------------------------
+---- MAP CELL VIEW ----------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
+CREATE MATERIALIZED VIEW cellmapview AS
+ SELECT
+ c.voyagename,
+ c.coordinate,
+ c.shape,
+ c.cellname,
+ d.name,
+ s.baracoudacode,
+ echobase_to_numeric(r.resultvalue) as resultvalue,
+ r.topiaid AS resultid
+ FROM
+ echobase_cell_spatial c,
+ result r,
+ datametadata d,
+ category cat,
+ speciescategory scat,
+ species s
+ WHERE
+ c.cellid = r.cell
+ AND r.datametadata = d.topiaid
+ AND r.category = cat.topiaid
+ AND cat.speciescategory = scat.topiaid
+ AND scat.species = s.topiaid
+ AND c.celltypename = 'Map cell';
+
+CREATE INDEX cellmapview_idx ON cellmapview(baracoudacode, name);
+CREATE UNIQUE INDEX cellmapview_uidx ON cellmapview(resultid);
+
+CREATE OR REPLACE VIEW meanMapcellBiomassEngrEnc AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'ENGR-ENC'
+ AND v.name = 'meanMapcellBiomass';
+
+CREATE OR REPLACE VIEW meanMapcellBiomassSardPil AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'SARD-PIL'
+ AND v.name = 'meanMapcellBiomass';
+
+CREATE OR REPLACE VIEW meanMapcellBiomassTracTru AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'TRAC-TRU'
+ AND v.name = 'meanMapcellBiomass';
+
+CREATE OR REPLACE VIEW meanMapcellBiomassSpraSpr AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'SPRA-SPR'
+ AND v.name = 'meanMapcellBiomass';
+
+CREATE OR REPLACE VIEW meanMapcellBiomassScomSco AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'SCOM-SCO'
+ AND v.name = 'meanMapcellBiomass';
+
+CREATE OR REPLACE VIEW meanMapcellBiomassMicrPou AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'MICR-POU'
+ AND v.name = 'meanMapcellBiomass';
+
+-----------------------------------------------------------------------------------------------------------------------
+---- OPERATION VIEW ---------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
+CREATE MATERIALIZED VIEW TotalSampleView AS
+ SELECT
+ echobase_operation_spatial.voyageid,
+ operation.id AS operation_id,
+ echobase_operation_spatial.coordinate,
+ sampletype.name AS sampletype_name,
+ sample.sampleweight,
+ sizecategory.name AS sizecategory_name,
+ species.baracoudacode,
+ sample.topiaid
+ FROM
+ echobase_operation_spatial,
+ operation,
+ sample,
+ speciescategory,
+ sizecategory,
+ species,
+ sampletype
+ WHERE
+ echobase_operation_spatial.operationid = operation.topiaid AND
+ operation.topiaid = sample.operation AND
+ sample.speciescategory = speciescategory.topiaid AND
+ sample.sampletype = sampletype.topiaid AND
+ speciescategory.sizecategory = sizecategory.topiaid AND
+ speciescategory.species = species.topiaid;
+
+CREATE INDEX TotalSampleView_idx ON TotalSampleView(baracoudacode, sampletype_name);
+
+CREATE OR REPLACE VIEW TotalSampleEngrEnc AS
+ SELECT
+ *
+ FROM
+ TotalSampleView v
+ WHERE
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'ENGR-ENC';
+
+CREATE OR REPLACE VIEW TotalSampleSardPil AS
+ SELECT
+ *
+ FROM
+ TotalSampleView v
+ WHERE
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'SARD-PIL';
+
+CREATE OR REPLACE VIEW TotalSampleTracTru AS
+ SELECT
+ *
+ FROM
+ TotalSampleView v
+ WHERE
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'TRAC-TRU';
+
+CREATE OR REPLACE VIEW TotalSampleSpraSpr AS
+ SELECT
+ *
+ FROM
+ TotalSampleView v
+ WHERE
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'SPRA-SPR';
+
+CREATE OR REPLACE VIEW TotalSampleScomSco AS
+ SELECT
+ *
+ FROM
+ TotalSampleView v
+ WHERE
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'SCOM-SCO';
+
+CREATE OR REPLACE VIEW TotalSampleMicrPou AS
+ SELECT
+ *
+ FROM
+ TotalSampleView v
+ WHERE
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'MICR-POU';
+
+-- Create a view with species catches as columns
+
+CREATE OR REPLACE VIEW TotalCatchSpOpWide AS
+ SELECT
+ e.voyagename,
+ e.operationname,
+ e.coordinate,
+ (SELECT SUM(t.sampleweight) FROM totalsampleengrenc t WHERE t.operation_id = e.operationname) AS TotalCatchENGRENC,
+ (SELECT SUM(t.sampleweight) FROM totalsamplesardpil t WHERE t.operation_id = e.operationname) AS TotalCatchSARDPIL,
+ (SELECT SUM(t.sampleweight) FROM totalsamplespraspr t WHERE t.operation_id = e.operationname) AS TotalCatchSPRASPR,
+ (SELECT SUM(t.sampleweight) FROM totalsamplemicrpou t WHERE t.operation_id = e.operationname) AS TotalCatchMICRPOU,
+ (SELECT SUM(t.sampleweight) FROM totalsamplescomsco t WHERE t.operation_id = e.operationname) AS TotalCatchSCOMSCO,
+ (SELECT SUM(t.sampleweight) FROM totalsampletractru t WHERE t.operation_id = e.operationname) AS TotalCatchTRACTRU,
+ e.operationid
+ FROM echobase_operation_spatial e;
\ No newline at end of file
Modified: trunk/echobase-domain/src/main/xmi/echobase.properties
===================================================================
--- trunk/echobase-domain/src/main/xmi/echobase.properties 2014-02-25 17:06:08 UTC (rev 953)
+++ trunk/echobase-domain/src/main/xmi/echobase.properties 2014-02-27 15:03:00 UTC (rev 954)
@@ -24,7 +24,7 @@
model.tagValue.notGenerateToString=true
model.tagValue.generateOperatorForDAOHelper=true
model.tagValue.constantPrefix=PROPERTY_
-model.tagValue.version=2.5.1
+model.tagValue.version=2.6
model.tagValue.noPCS=true
model.tagValue.doNotGenerateBooleanGetMethods=true
model.tagValue.indexForeignKeys=true
Modified: trunk/echobase-services/src/main/resources/postgis-view.sql
===================================================================
--- trunk/echobase-services/src/main/resources/postgis-view.sql 2014-02-25 17:06:08 UTC (rev 953)
+++ trunk/echobase-services/src/main/resources/postgis-view.sql 2014-02-27 15:03:00 UTC (rev 954)
@@ -20,25 +20,258 @@
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
-- #L%
---
--- ajout de vues liés aux tables spatiales
-DROP VIEW IF EXISTS echobase_cell_spatial_result;
-CREATE OR REPLACE VIEW echobase_cell_spatial_result AS
+-----------------------------------------------------------------------------------------------------------------------
+---- DROP EXISTING VIEW - INDEX - FUNCTION - TRIGGER ------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
+DROP VIEW IF EXISTS echobase_cell_spatial_result CASCADE;
+DROP VIEW IF EXISTS cellmapview CASCADE;
+
+DROP VIEW IF EXISTS echobase_cell_spatial_data CASCADE ;
+DROP VIEW IF EXISTS meanMapcellBiomassEngrEnc CASCADE;
+DROP VIEW IF EXISTS meanMapcellBiomassSardPil CASCADE;
+DROP VIEW IF EXISTS meanMapcellBiomassTracTru CASCADE;
+DROP VIEW IF EXISTS meanMapcellBiomassSpraSpr CASCADE;
+DROP VIEW IF EXISTS meanMapcellBiomassScomSco CASCADE;
+DROP VIEW IF EXISTS meanMapcellBiomassMicrPou CASCADE;
+DROP VIEW IF EXISTS TotalCatchSpOpWide CASCADE;
+DROP VIEW IF EXISTS TotalSampleEngrEnc CASCADE;
+DROP VIEW IF EXISTS TotalSampleSardPil CASCADE;
+DROP VIEW IF EXISTS TotalSampleTracTru CASCADE;
+DROP VIEW IF EXISTS TotalSampleSpraSpr CASCADE;
+DROP VIEW IF EXISTS TotalSampleScomSco CASCADE;
+DROP VIEW IF EXISTS TotalSampleMicrPou CASCADE;
+
+DROP INDEX IF EXISTS cellEsduViewSpeciesBiomass_uidx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewSpeciesAbundance_uidx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewSpeciesMeanLength_uidx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewEchotypeNasc_uidx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewEchotype_idx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewSpecies_idx CASCADE;
+DROP INDEX IF EXISTS cellEsduViewSpeciesResultGrouped_idx CASCADE;
+DROP INDEX IF EXISTS cellmapview_idx CASCADE;
+DROP INDEX IF EXISTS cellmapview_uidx CASCADE;
+DROP INDEX IF EXISTS TotalSampleView_idx CASCADE;
+
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewEchotypeNasc CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewSpeciesBiomass CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewSpeciesAbundance CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewSpeciesMeanLength CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewEchotype CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewSpeciesResultGrouped CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellEsduViewSpecies CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS cellmapview CASCADE;
+DROP MATERIALIZED VIEW IF EXISTS TotalSampleView CASCADE;
+
+DROP TRIGGER IF EXISTS echobase_refresh_views_trigger ON entitymodificationlog CASCADE;
+DROP FUNCTION IF EXISTS echobase_to_numeric(string VARCHAR) CASCADE;
+DROP FUNCTION IF EXISTS echobase_refresh_views() CASCADE;
+
+-----------------------------------------------------------------------------------------------------------------------
+---- CREATE FUNCTION - TRIGGER ----------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION echobase_to_numeric(string VARCHAR)
+ RETURNS REAL AS $$
+BEGIN
+ RETURN string::real;
+ EXCEPTION WHEN invalid_text_representation
+ THEN
+ RETURN NULL;
+END
+$$ LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION echobase_refresh_views()
+ RETURNS TRIGGER AS $$
+DECLARE
+ operationtype VARCHAR;
+ result RECORD;
+BEGIN
+
+ IF (TG_OP = 'DELETE')
+ THEN
+ result = OLD;
+ ELSE
+ result = NEW;
+ END IF;
+
+ operationtype = result.entitytype;
+
+ IF (operationtype ILIKE '%Import%' OR operationtype ILIKE '%Removed%')
+ THEN
+ -- Can update views
+ RAISE NOTICE 'reload cellEsduViewEchotype';
+ REFRESH MATERIALIZED VIEW cellEsduViewEchotype;
+ REINDEX INDEX cellEsduViewEchotype_idx;
+
+ RAISE NOTICE 'reload cellEsduViewSpecies';
+ REFRESH MATERIALIZED VIEW cellEsduViewSpecies;
+ REINDEX INDEX cellEsduViewSpecies_idx;
+
+ RAISE NOTICE 'reload cellEsduViewSpeciesResultGrouped';
+ REFRESH MATERIALIZED VIEW cellEsduViewSpeciesResultGrouped;
+ REINDEX INDEX cellEsduViewSpeciesResultGrouped_idx;
+
+ RAISE NOTICE 'reload cellEsduViewEchotypeNasc';
+ REFRESH MATERIALIZED VIEW cellEsduViewEchotypeNasc;
+
+ RAISE NOTICE 'reload cellEsduViewSpeciesBiomass';
+ REFRESH MATERIALIZED VIEW cellEsduViewSpeciesBiomass;
+ REINDEX INDEX cellEsduViewSpeciesBiomass_uidx;
+
+ RAISE NOTICE 'reload cellEsduViewSpeciesAbundance';
+ REFRESH MATERIALIZED VIEW cellEsduViewSpeciesAbundance;
+ REINDEX INDEX cellEsduViewSpeciesAbundance_uidx;
+
+ RAISE NOTICE 'reload cellEsduViewSpeciesMeanLength';
+ REFRESH MATERIALIZED VIEW cellEsduViewSpeciesMeanLength;
+ REINDEX INDEX cellEsduViewSpeciesMeanLength_uidx;
+
+ RAISE NOTICE 'reload cellmapview';
+ REFRESH MATERIALIZED VIEW cellmapview;
+ REINDEX INDEX cellmapview_idx;
+ REINDEX INDEX cellmapview_uidx;
+ END IF;
+
+ RETURN result;
+END
+$$
+LANGUAGE 'plpgsql';
+
+CREATE TRIGGER echobase_refresh_views_trigger
+AFTER INSERT OR UPDATE ON entitymodificationlog
+EXECUTE PROCEDURE echobase_refresh_views();
+
+-----------------------------------------------------------------------------------------------------------------------
+---- CELL RESULT VIEW -------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
+CREATE MATERIALIZED VIEW cellEsduViewEchotype AS
SELECT
- s.*,
- m.topiaId AS metaDataId,
- m.name AS metaDataName,
- r.resultvalue AS resultValue,
- r.topiaid AS resultId
+ c.voyagename,
+ c.coordinate,
+ c.shape,
+ c.cellname,
+ d.name,
+ echobase_to_numeric(r.resultvalue) as resultvalue,
+ e.name as echotypeName,
+ e.meaning as echotypeMeaning,
+ r.topiaid AS resultid
FROM
- echobase_cell_spatial s,
+ echobase_cell_spatial c,
result r,
- datametadata m
+ datametadata d,
+ category cat,
+ echotype e
WHERE
- s.cellid = r.cell AND
- r.datametadata = m.topiaid;
+ c.cellid = r.cell
+ AND r.datametadata = d.topiaid
+ AND r.category = cat.topiaid
+ AND cat.echotype IS NOT NULL
+ AND cat.echotype = e.topiaid
+ AND c.celltypename = 'Elementary Distance Sampling Unit';
-DROP VIEW IF EXISTS echobase_cell_spatial_data;
+CREATE INDEX cellEsduViewEchotype_idx ON cellEsduViewEchotype(name);
+
+CREATE MATERIALIZED VIEW cellEsduViewEchotypeNasc AS
+ SELECT
+ *
+ FROM
+ cellEsduViewEchotype v
+ WHERE
+ v.name = 'NASC';
+
+CREATE UNIQUE INDEX cellEsduViewEchotypeNasc_uidx ON cellEsduViewEchotypeNasc(resultid);
+
+CREATE MATERIALIZED VIEW cellEsduViewSpecies AS
+ SELECT
+ c.voyagename,
+ c.coordinate,
+ c.shape,
+ c.cellname,
+ d.name,
+ echobase_to_numeric(r.resultvalue) as resultvalue,
+ s.baracoudacode,
+ r.topiaid AS resultid
+ FROM
+ echobase_cell_spatial c,
+ result r,
+ datametadata d,
+ category cat,
+ speciescategory scat,
+ species s
+ WHERE
+ c.cellid = r.cell
+ AND r.datametadata = d.topiaid
+ AND r.category = cat.topiaid
+ AND cat.speciescategory IS NOT NULL
+ AND cat.speciescategory = scat.topiaid
+ AND scat.species = s.topiaid
+ AND c.celltypename = 'Elementary Distance Sampling Unit';
+
+CREATE INDEX cellEsduViewSpecies_idx ON cellEsduViewSpecies(name);
+
+CREATE MATERIALIZED VIEW cellEsduViewSpeciesResultGrouped AS
+ SELECT
+ count(*) AS nbResults,
+ name,
+ cellname,
+ baracoudacode,
+ sum(resultvalue) as resultvalue,
+ cellname || '-' || baracoudacode || '-' || name as id
+ FROM cellEsduViewSpecies
+ WHERE
+ baracoudacode in ('ENGR-ENC', 'SARD-PIL', 'TRAC-TRU', 'SPRA-SPR', 'SCOM-SCO', 'MICR-POU')
+ AND name in ('Biomass','Abundance','MeanLength')
+ GROUP BY baracoudacode, cellname, name;
+
+CREATE INDEX cellEsduViewSpeciesResultGrouped_idx ON cellEsduViewSpecies(baracoudacode, cellname, name);
+
+CREATE MATERIALIZED VIEW cellEsduViewSpeciesBiomass AS
+ SELECT
+ distinct v2.coordinate,
+ v2.voyagename,
+ v.*
+ FROM
+ cellEsduViewSpeciesResultGrouped v
+ JOIN cellEsduViewSpecies v2 USING (name, baracoudacode, cellname)
+ WHERE
+ v.name = 'Biomass';
+
+CREATE UNIQUE INDEX cellEsduViewSpeciesBiomass_uidx ON cellEsduViewSpeciesBiomass(id);
+
+CREATE MATERIALIZED VIEW cellEsduViewSpeciesAbundance AS
+ SELECT
+ distinct v2.coordinate,
+ v2.voyagename,
+ v.*
+ FROM
+ cellEsduViewSpeciesResultGrouped v
+ JOIN cellEsduViewSpecies v2 USING (name, baracoudacode, cellname)
+ WHERE
+ v.name = 'Abundance';
+
+CREATE UNIQUE INDEX cellEsduViewSpeciesAbundance_uidx ON cellEsduViewSpeciesAbundance(id);
+
+CREATE MATERIALIZED VIEW cellEsduViewSpeciesMeanLength AS
+ SELECT
+ distinct v2.coordinate,
+ v2.voyagename,
+ v.*
+ FROM
+ cellEsduViewSpeciesResultGrouped v
+ JOIN cellEsduViewSpecies v2 USING (name, baracoudacode, cellname)
+ WHERE
+ v.name = 'MeanLength';
+
+CREATE UNIQUE INDEX cellEsduViewSpeciesMeanLength_uidx ON cellEsduViewSpeciesMeanLength(id);
+
+-----------------------------------------------------------------------------------------------------------------------
+---- CELL DATA VIEW ---------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
CREATE OR REPLACE VIEW echobase_cell_spatial_data AS
SELECT
s.*,
@@ -54,10 +287,98 @@
s.cellid = d.cell AND
d.datametadata = m.topiaid;
-DROP VIEW IF EXISTS TotalSampleEngrEnc;
-CREATE OR REPLACE VIEW TotalSampleEngrEnc AS
+-----------------------------------------------------------------------------------------------------------------------
+---- MAP CELL VIEW ----------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+CREATE MATERIALIZED VIEW cellmapview AS
SELECT
+ c.voyagename,
+ c.coordinate,
+ c.shape,
+ c.cellname,
+ d.name,
+ s.baracoudacode,
+ echobase_to_numeric(r.resultvalue) as resultvalue,
+ r.topiaid AS resultid
+ FROM
+ echobase_cell_spatial c,
+ result r,
+ datametadata d,
+ category cat,
+ speciescategory scat,
+ species s
+ WHERE
+ c.cellid = r.cell
+ AND r.datametadata = d.topiaid
+ AND r.category = cat.topiaid
+ AND cat.speciescategory = scat.topiaid
+ AND scat.species = s.topiaid
+ AND c.celltypename = 'Map cell';
+
+CREATE INDEX cellmapview_idx ON cellmapview(baracoudacode, name);
+CREATE UNIQUE INDEX cellmapview_uidx ON cellmapview(resultid);
+
+CREATE OR REPLACE VIEW meanMapcellBiomassEngrEnc AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'ENGR-ENC'
+ AND v.name = 'meanMapcellBiomass';
+
+CREATE OR REPLACE VIEW meanMapcellBiomassSardPil AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'SARD-PIL'
+ AND v.name = 'meanMapcellBiomass';
+
+CREATE OR REPLACE VIEW meanMapcellBiomassTracTru AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'TRAC-TRU'
+ AND v.name = 'meanMapcellBiomass';
+
+CREATE OR REPLACE VIEW meanMapcellBiomassSpraSpr AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'SPRA-SPR'
+ AND v.name = 'meanMapcellBiomass';
+
+CREATE OR REPLACE VIEW meanMapcellBiomassScomSco AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'SCOM-SCO'
+ AND v.name = 'meanMapcellBiomass';
+
+CREATE OR REPLACE VIEW meanMapcellBiomassMicrPou AS
+ SELECT
+ *
+ FROM
+ cellmapview v
+ WHERE
+ v.baracoudacode = 'MICR-POU'
+ AND v.name = 'meanMapcellBiomass';
+
+-----------------------------------------------------------------------------------------------------------------------
+---- OPERATION VIEW ---------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------
+
+CREATE MATERIALIZED VIEW TotalSampleView AS
+ SELECT
echobase_operation_spatial.voyageid,
operation.id AS operation_id,
echobase_operation_spatial.coordinate,
@@ -80,212 +401,76 @@
sample.speciescategory = speciescategory.topiaid AND
sample.sampletype = sampletype.topiaid AND
speciescategory.sizecategory = sizecategory.topiaid AND
- speciescategory.species = species.topiaid AND
- sampletype.name = 'Total' AND
- species.baracoudacode = 'ENGR-ENC';
+ speciescategory.species = species.topiaid;
-DROP VIEW IF EXISTS TotalSampleSardPil;
+CREATE INDEX TotalSampleView_idx ON TotalSampleView(baracoudacode, sampletype_name);
+
+CREATE OR REPLACE VIEW TotalSampleEngrEnc AS
+ SELECT
+ *
+ FROM
+ TotalSampleView v
+ WHERE
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'ENGR-ENC';
+
CREATE OR REPLACE VIEW TotalSampleSardPil AS
SELECT
- echobase_operation_spatial.voyageid,
- operation.id AS operation_id,
- echobase_operation_spatial.coordinate,
- sampletype.name AS sampletype_name,
- sample.sampleweight,
- sizecategory.name AS sizecategory_name,
- species.baracoudacode,
- sample.topiaid
+ *
FROM
- echobase_operation_spatial,
- operation,
- sample,
- speciescategory,
- sizecategory,
- species,
- sampletype
+ TotalSampleView v
WHERE
- echobase_operation_spatial.operationid = operation.topiaid AND
- operation.topiaid = sample.operation AND
- sample.speciescategory = speciescategory.topiaid AND
- sample.sampletype = sampletype.topiaid AND
- speciescategory.sizecategory = sizecategory.topiaid AND
- speciescategory.species = species.topiaid AND
- sampletype.name = 'Total' AND
- species.baracoudacode = 'SARD-PIL';
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'SARD-PIL';
-DROP VIEW IF EXISTS TotalSampleTracTru;
CREATE OR REPLACE VIEW TotalSampleTracTru AS
SELECT
- echobase_operation_spatial.voyageid,
- operation.id AS operation_id,
- echobase_operation_spatial.coordinate,
- sampletype.name AS sampletype_name,
- sample.sampleweight,
- sizecategory.name AS sizecategory_name,
- species.baracoudacode,
- sample.topiaid
+ *
FROM
- echobase_operation_spatial,
- operation,
- sample,
- speciescategory,
- sizecategory,
- species,
- sampletype
+ TotalSampleView v
WHERE
- echobase_operation_spatial.operationid = operation.topiaid AND
- operation.topiaid = sample.operation AND
- sample.speciescategory = speciescategory.topiaid AND
- sample.sampletype = sampletype.topiaid AND
- speciescategory.sizecategory = sizecategory.topiaid AND
- speciescategory.species = species.topiaid AND
- sampletype.name = 'Total' AND
- species.baracoudacode = 'TRAC-TRU';
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'TRAC-TRU';
-DROP VIEW IF EXISTS TotalSampleSpraSpr;
CREATE OR REPLACE VIEW TotalSampleSpraSpr AS
SELECT
- echobase_operation_spatial.voyageid,
- operation.id AS operation_id,
- echobase_operation_spatial.coordinate,
- sampletype.name AS sampletype_name,
- sample.sampleweight,
- sizecategory.name AS sizecategory_name,
- species.baracoudacode,
- sample.topiaid
+ *
FROM
- echobase_operation_spatial,
- operation,
- sample,
- speciescategory,
- sizecategory,
- species,
- sampletype
+ TotalSampleView v
WHERE
- echobase_operation_spatial.operationid = operation.topiaid AND
- operation.topiaid = sample.operation AND
- sample.speciescategory = speciescategory.topiaid AND
- sample.sampletype = sampletype.topiaid AND
- speciescategory.sizecategory = sizecategory.topiaid AND
- speciescategory.species = species.topiaid AND
- sampletype.name = 'Total' AND
- species.baracoudacode = 'SPRA-SPR';
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'SPRA-SPR';
-DROP VIEW IF EXISTS TotalSampleScomSco;
CREATE OR REPLACE VIEW TotalSampleScomSco AS
SELECT
- echobase_operation_spatial.voyageid,
- operation.id AS operation_id,
- echobase_operation_spatial.coordinate,
- sampletype.name AS sampletype_name,
- sample.sampleweight,
- sizecategory.name AS sizecategory_name,
- species.baracoudacode,
- sample.topiaid
+ *
FROM
- echobase_operation_spatial,
- operation,
- sample,
- speciescategory,
- sizecategory,
- species,
- sampletype
+ TotalSampleView v
WHERE
- echobase_operation_spatial.operationid = operation.topiaid AND
- operation.topiaid = sample.operation AND
- sample.speciescategory = speciescategory.topiaid AND
- sample.sampletype = sampletype.topiaid AND
- speciescategory.sizecategory = sizecategory.topiaid AND
- speciescategory.species = species.topiaid AND
- sampletype.name = 'Total' AND
- species.baracoudacode = 'SCOM-SCO';
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'SCOM-SCO';
-DROP VIEW IF EXISTS TotalSampleMicrPou;
CREATE OR REPLACE VIEW TotalSampleMicrPou AS
SELECT
- echobase_operation_spatial.voyageid,
- operation.id AS operation_id,
- echobase_operation_spatial.coordinate,
- sampletype.name AS sampletype_name,
- sample.sampleweight,
- sizecategory.name AS sizecategory_name,
- species.baracoudacode,
- sample.topiaid
+ *
FROM
- echobase_operation_spatial,
- operation,
- sample,
- speciescategory,
- sizecategory,
- species,
- sampletype
+ TotalSampleView v
WHERE
- echobase_operation_spatial.operationid = operation.topiaid AND
- operation.topiaid = sample.operation AND
- sample.speciescategory = speciescategory.topiaid AND
- sample.sampletype = sampletype.topiaid AND
- speciescategory.sizecategory = sizecategory.topiaid AND
- speciescategory.species = species.topiaid AND
- sampletype.name = 'Total' AND
- species.baracoudacode = 'MICR-POU';
+ v.sampletype_name = 'Total' AND
+ v.baracoudacode = 'MICR-POU';
-- Create a view with species catches as columns
-DROP VIEW IF EXISTS TotalCatchSpOpWide;
CREATE OR REPLACE VIEW TotalCatchSpOpWide AS
SELECT
- echobase_operation_spatial.voyagename,
- echobase_operation_spatial.operationname,
- echobase_operation_spatial.coordinate,
- (SELECT
- SUM(totalsampleengrenc.sampleweight)
- FROM totalsampleengrenc
- WHERE totalsampleengrenc.operation_id =
- echobase_operation_spatial.operationname) AS TotalCatchENGRENC,
- (SELECT
- SUM(totalsamplesardpil.sampleweight)
- FROM totalsamplesardpil
- WHERE totalsamplesardpil.operation_id =
- echobase_operation_spatial.operationname) AS TotalCatchSARDPIL,
- (SELECT
- SUM(totalsamplespraspr.sampleweight)
- FROM totalsamplespraspr
- WHERE totalsamplespraspr.operation_id =
- echobase_operation_spatial.operationname) AS TotalCatchSPRASPR,
- (SELECT
- SUM(totalsamplemicrpou.sampleweight)
- FROM totalsamplemicrpou
- WHERE totalsamplemicrpou.operation_id =
- echobase_operation_spatial.operationname) AS TotalCatchMICRPOU,
- (SELECT
- SUM(totalsamplescomsco.sampleweight)
- FROM totalsamplescomsco
- WHERE totalsamplescomsco.operation_id =
- echobase_operation_spatial.operationname) AS TotalCatchSCOMSCO,
- (SELECT
- SUM(totalsampletractru.sampleweight)
- FROM totalsampletractru
- WHERE totalsampletractru.operation_id =
- echobase_operation_spatial.operationname) AS TotalCatchTRACTRU,
- echobase_operation_spatial.operationid
- FROM echobase_operation_spatial;
-
-DROP VIEW IF EXISTS cellmapview;
-CREATE OR REPLACE VIEW cellmapview AS
- 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
- FROM echobase_cell_spatial, result, datametadata, category, speciescategory,
- species
- WHERE echobase_cell_spatial.cellid = result.cell
- AND result.datametadata = datametadata.topiaid
- AND result.category = category.topiaid
- AND category.speciescategory = speciescategory.topiaid
- AND speciescategory.species = species.topiaid
- AND echobase_cell_spatial.celltypename = 'Map cell';
\ No newline at end of file
+ e.voyagename,
+ e.operationname,
+ e.coordinate,
+ (SELECT SUM(t.sampleweight) FROM totalsampleengrenc t WHERE t.operation_id = e.operationname) AS TotalCatchENGRENC,
+ (SELECT SUM(t.sampleweight) FROM totalsamplesardpil t WHERE t.operation_id = e.operationname) AS TotalCatchSARDPIL,
+ (SELECT SUM(t.sampleweight) FROM totalsamplespraspr t WHERE t.operation_id = e.operationname) AS TotalCatchSPRASPR,
+ (SELECT SUM(t.sampleweight) FROM totalsamplemicrpou t WHERE t.operation_id = e.operationname) AS TotalCatchMICRPOU,
+ (SELECT SUM(t.sampleweight) FROM totalsamplescomsco t WHERE t.operation_id = e.operationname) AS TotalCatchSCOMSCO,
+ (SELECT SUM(t.sampleweight) FROM totalsampletractru t WHERE t.operation_id = e.operationname) AS TotalCatchTRACTRU,
+ e.operationid
+ FROM echobase_operation_spatial e;
\ No newline at end of file
1
0
24 Feb '14
See <http://ci.codelutin.com/jenkins/job/echobase-nightly/6/changes>
Changes:
[Tony CHEMIT] fixes #4476: La colonne campagne est en double sur l'écran Tableau de bord
[maven-release] [maven-release-plugin] prepare for next development iteration
[maven-release] [maven-release-plugin] prepare release echobase-2.5.2
[Tony CHEMIT] make project release aware
[Tony CHEMIT] make project release aware
[Tony CHEMIT] fixe license headers
[Tony CHEMIT] make project release aware
[Tony CHEMIT] fixes #4061: Updates mavenpom to 4.7
[Tony CHEMIT] fixes #4062: Updates to topia 3.0
[Tony CHEMIT] prepare new release 2.5.2
------------------------------------------
[...truncated 671 lines...]
at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:207)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
[WARNING] skip failed file : Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…> for reason Can only have one file header start tag : #%L
org.codehaus.mojo.license.header.InvalideFileHeaderException: Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…> for reason Can only have one file header start tag : #%L
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:912)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:825)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processCommentStyle(AbstractFileHeaderMojo.java:799)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.doAction(AbstractFileHeaderMojo.java:580)
at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:207)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
[WARNING] skip failed file : Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…> for reason Can only have one file header start tag : #%L
org.codehaus.mojo.license.header.InvalideFileHeaderException: Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…> for reason Can only have one file header start tag : #%L
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:912)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:825)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processCommentStyle(AbstractFileHeaderMojo.java:799)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.doAction(AbstractFileHeaderMojo.java:580)
at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:207)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
[WARNING] skip failed file : Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…> for reason Can only have one file header start tag : #%L
org.codehaus.mojo.license.header.InvalideFileHeaderException: Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…> for reason Can only have one file header start tag : #%L
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:912)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:825)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processCommentStyle(AbstractFileHeaderMojo.java:799)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.doAction(AbstractFileHeaderMojo.java:580)
at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:207)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
[INFO] Scan 479 files header done in 401.061ms.
[INFO]
* uptodate header on 60 files.
* add header on 415 files.
* fail header on 4 files.
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ echobase-domain ---
[INFO] Compiling 406 source files to <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…>
[INFO] -------------------------------------------------------------
[WARNING] COMPILATION WARNING :
[INFO] -------------------------------------------------------------
[WARNING] bootstrap class path not set in conjunction with -source 1.6
[INFO] 1 warning
[INFO] -------------------------------------------------------------
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…>:[3,1] class, interface, or enum expected
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…>:[3,1] class, interface, or enum expected
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…>:[3,1] class, interface, or enum expected
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…>:[3,1] class, interface, or enum expected
[INFO] 4 errors
[INFO] -------------------------------------------------------------
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] EchoBase .......................................... SUCCESS [10.310s]
[INFO] EchoBase :: Domain ................................ FAILURE [18.712s]
[INFO] EchoBase :: Services .............................. SKIPPED
[INFO] EchoBase :: UI .................................... SKIPPED
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 30.485s
[INFO] Finished at: Wed Feb 19 00:07:16 CET 2014
[INFO] Final Memory: 61M/960M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project echobase-domain: Compilation failure: Compilation failure:
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…>:[3,1] class, interface, or enum expected
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…>:[3,1] class, interface, or enum expected
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…>:[3,1] class, interface, or enum expected
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/ws/trunk/echobase-doma…>:[3,1] class, interface, or enum expected
[ERROR] -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project echobase-domain: Compilation failure
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure
at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858)
at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
... 30 more
[ERROR]
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <goals> -rf :echobase-domain
Failed to send e-mail to maven-release because no e-mail address is known, and no default e-mail domain is configured
Sending e-mails to: echobase-commits(a)list.forge.codelutin.com chemit+codelutin-ci(a)codelutin.com
channel stopped
Skipping sonar analysis due to bad build status FAILURE
Failed to send e-mail to maven-release because no e-mail address is known, and no default e-mail domain is configured
1
2
Build failed in Jenkins: echobase-nightly » EchoBase :: Domain #6
by admin+ci-codelutin.com@codelutin.com 24 Feb '14
by admin+ci-codelutin.com@codelutin.com 24 Feb '14
24 Feb '14
See <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
Changes:
[Tony CHEMIT] fixes #4476: La colonne campagne est en double sur l'écran Tableau de bord
[maven-release] [maven-release-plugin] prepare for next development iteration
[maven-release] [maven-release-plugin] prepare release echobase-2.5.2
[Tony CHEMIT] fixe license headers
[Tony CHEMIT] make project release aware
[Tony CHEMIT] prepare new release 2.5.2
------------------------------------------
[...truncated 466 lines...]
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] - adding license header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[WARNING] skip failed file : Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> for reason Can only have one file header start tag : #%L
org.codehaus.mojo.license.header.InvalideFileHeaderException: Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> for reason Can only have one file header start tag : #%L
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:912)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:825)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processCommentStyle(AbstractFileHeaderMojo.java:799)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.doAction(AbstractFileHeaderMojo.java:580)
at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:207)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
[WARNING] skip failed file : Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> for reason Can only have one file header start tag : #%L
org.codehaus.mojo.license.header.InvalideFileHeaderException: Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> for reason Can only have one file header start tag : #%L
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:912)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:825)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processCommentStyle(AbstractFileHeaderMojo.java:799)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.doAction(AbstractFileHeaderMojo.java:580)
at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:207)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
[WARNING] skip failed file : Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> for reason Can only have one file header start tag : #%L
org.codehaus.mojo.license.header.InvalideFileHeaderException: Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> for reason Can only have one file header start tag : #%L
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:912)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:825)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processCommentStyle(AbstractFileHeaderMojo.java:799)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.doAction(AbstractFileHeaderMojo.java:580)
at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:207)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
[WARNING] skip failed file : Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> for reason Can only have one file header start tag : #%L
org.codehaus.mojo.license.header.InvalideFileHeaderException: Could not extract header on file <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…> for reason Can only have one file header start tag : #%L
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:912)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processFile(AbstractFileHeaderMojo.java:825)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.processCommentStyle(AbstractFileHeaderMojo.java:799)
at org.codehaus.mojo.license.AbstractFileHeaderMojo.doAction(AbstractFileHeaderMojo.java:580)
at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:207)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
[INFO] Scan 479 files header done in 401.061ms.
[INFO]
* uptodate header on 60 files.
* add header on 415 files.
* fail header on 4 files.
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ echobase-domain ---
[INFO] Compiling 406 source files to <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>
[INFO] -------------------------------------------------------------
[WARNING] COMPILATION WARNING :
[INFO] -------------------------------------------------------------
[WARNING] bootstrap class path not set in conjunction with -source 1.6
[INFO] 1 warning
[INFO] -------------------------------------------------------------
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>:[3,1] class, interface, or enum expected
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>:[3,1] class, interface, or enum expected
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>:[3,1] class, interface, or enum expected
[ERROR] <http://ci.codelutin.com/jenkins/job/echobase-nightly/fr.ifremer.echobase$ec…>:[3,1] class, interface, or enum expected
[INFO] 4 errors
[INFO] -------------------------------------------------------------
[JENKINS] Archiving disabled
1
2
24 Feb '14
Author: tchemit
Date: 2014-02-24 16:25:00 +0100 (Mon, 24 Feb 2014)
New Revision: 949
Url: http://forge.codelutin.com/projects/echobase/repository/revisions/949
Log:
fixes #4550: migrates commons-collections to 4
Modified:
trunk/echobase-domain/pom.xml
trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java
trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java
trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java
trunk/echobase-services/pom.xml
trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java
trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java
trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java
trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java
trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java
trunk/echobase-ui/pom.xml
trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java
trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java
trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java
trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java
Modified: trunk/echobase-domain/pom.xml
===================================================================
--- trunk/echobase-domain/pom.xml 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-domain/pom.xml 2014-02-24 15:25:00 UTC (rev 949)
@@ -144,8 +144,8 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java
===================================================================
--- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -33,7 +33,7 @@
import fr.ifremer.echobase.entities.references.CellType;
import fr.ifremer.echobase.entities.references.SampleTypeImpl;
import fr.ifremer.echobase.entities.references.SizeCategory;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import java.util.Collection;
import java.util.Set;
Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java
===================================================================
--- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -26,7 +26,7 @@
import fr.ifremer.echobase.entities.data.Cell;
import fr.ifremer.echobase.entities.data.CellTopiaDao;
import fr.ifremer.echobase.entities.data.Voyage;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.nuiton.csv.ImportRuntimeException;
import org.nuiton.csv.ValueParser;
import org.nuiton.topia.persistence.TopiaException;
Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java
===================================================================
--- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -26,7 +26,7 @@
import com.google.common.base.Preconditions;
import com.google.common.io.Files;
import fr.ifremer.echobase.EchoBaseTechnicalException;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
Modified: trunk/echobase-services/pom.xml
===================================================================
--- trunk/echobase-services/pom.xml 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-services/pom.xml 2014-02-24 15:25:00 UTC (rev 949)
@@ -138,8 +138,8 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -34,7 +34,7 @@
import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum;
import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext;
import fr.ifremer.echobase.services.EchoBaseServiceSupport;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -87,7 +87,7 @@
import fr.ifremer.echobase.entities.references.Vessel;
import fr.ifremer.echobase.entities.references.VesselType;
import fr.ifremer.echobase.services.EchoBaseServiceSupport;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.nuiton.decorator.Decorator;
import org.nuiton.decorator.DecoratorMulti18nProvider;
import org.nuiton.decorator.DecoratorUtil;
Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -45,7 +45,7 @@
import fr.ifremer.echobase.io.InputFile;
import fr.ifremer.echobase.services.service.importdata.csv.AcousticImportModel;
import fr.ifremer.echobase.services.service.importdata.csv.AcousticImportRow;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.csv.Import;
Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java
===================================================================
--- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/exportdb/ExportDbServiceTest.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -43,7 +43,7 @@
import fr.ifremer.echobase.services.EchoBaseTestServiceSupport;
import fr.ifremer.echobase.services.FakeEchoBaseServiceContext;
import fr.ifremer.echobase.services.service.UserDbPersistenceService;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Assert;
Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java
===================================================================
--- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -95,7 +95,7 @@
import fr.ifremer.echobase.services.service.importdata.ResultsVoyageImportService;
import fr.ifremer.echobase.services.service.removedata.RemoveDataConfiguration;
import fr.ifremer.echobase.services.service.removedata.RemoveDataService;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Assert;
Modified: trunk/echobase-ui/pom.xml
===================================================================
--- trunk/echobase-ui/pom.xml 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-ui/pom.xml 2014-02-24 15:25:00 UTC (rev 949)
@@ -277,8 +277,8 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java
===================================================================
--- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -47,7 +47,7 @@
import fr.ird.converter.FloatConverter;
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.Converter;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java
===================================================================
--- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -32,7 +32,7 @@
import fr.ifremer.echobase.persistence.EchobaseTopiaApplicationContexts;
import fr.ifremer.echobase.persistence.JdbcConfiguration;
import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.topia.persistence.TopiaNotFoundException;
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 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractJSONPaginedAction.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -23,7 +23,7 @@
*/
package fr.ifremer.echobase.ui.actions;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.struts2.json.JSONException;
import org.apache.struts2.json.JSONUtil;
Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java
===================================================================
--- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2014-02-19 21:03:53 UTC (rev 948)
+++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2014-02-24 15:25:00 UTC (rev 949)
@@ -27,7 +27,7 @@
import fr.ifremer.echobase.entities.data.Voyage;
import fr.ifremer.echobase.services.service.embeddedapplication.EmbeddedApplicationConfiguration;
import fr.ifremer.echobase.ui.actions.AbstractConfigureAction;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1
0
19 Feb '14
Author: tchemit
Date: 2014-02-19 22:03:53 +0100 (Wed, 19 Feb 2014)
New Revision: 948
Url: http://forge.codelutin.com/projects/echobase/repository/revisions/948
Log:
fixes #4510: Erreur frappe dans script startEchobase.sh
Modified:
trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh
Modified: trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh
===================================================================
--- trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh 2014-02-18 21:00:37 UTC (rev 947)
+++ trunk/echobase-ui/src/main/assembly/dist/startEchobase.sh 2014-02-19 21:03:53 UTC (rev 948)
@@ -10,7 +10,7 @@
OLDPWD=`pwd`
cd `dirname $0`
-ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=./logs"
+ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m -Dechobase.log.dir=./logs"
java $ECHOBASE_OPTS -jar ${embeddedWarName}.war $*
cd "$OLDPWD"
1
0
r947 - trunk/echobase-domain/src/main/resources/i18n
by tchemit@users.forge.codelutin.com 18 Feb '14
by tchemit@users.forge.codelutin.com 18 Feb '14
18 Feb '14
Author: tchemit
Date: 2014-02-18 22:00:37 +0100 (Tue, 18 Feb 2014)
New Revision: 947
Url: http://forge.codelutin.com/projects/echobase/repository/revisions/947
Log:
fixes #4476: La colonne campagne est en double sur l'?\195?\169cran Tableau de bord
Modified:
trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties
trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties
Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties
===================================================================
--- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2014-02-18 13:58:16 UTC (rev 946)
+++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2014-02-18 21:00:37 UTC (rev 947)
@@ -25,7 +25,7 @@
echobase.common.importType.resultsVoyage=Import the voyage-related results
echobase.common.importType.resultsVoyage.short=R Voyage
echobase.common.importType.voyage=Voyage import
-echobase.common.importType.voyage.short=Voyage
+echobase.common.importType.voyage.short=Complete voyage
echobase.config.csv.separator.description=Csv separator character
echobase.config.data.directory.description=Path to application data
echobase.config.documentationUrl.description=Where to find EchoBase online documentation
Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties
===================================================================
--- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2014-02-18 13:58:16 UTC (rev 946)
+++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2014-02-18 21:00:37 UTC (rev 947)
@@ -25,7 +25,7 @@
echobase.common.importType.resultsVoyage=Import des résultats du voyage
echobase.common.importType.resultsVoyage.short=R Voyage
echobase.common.importType.voyage=Import Campagne
-echobase.common.importType.voyage.short=Campagne
+echobase.common.importType.voyage.short=Campagne complête
echobase.config.csv.separator.description=Caractère séparateur pour les fichiers csv
echobase.config.data.directory.description=Répertoire des données de l'application
echobase.config.documentationUrl.description=Où trouver la documentation en ligne d'EchoBase
1
0
The EchoBase team is pleased to announce the echobase-2.5.2 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:
https://maven-site.forge.codelutin.com/echobase
Changes
-------
Changes in this version include:
Fixed Bugs:
o Pb de connexion et d'ajout de données dans base de travail Issue: 4443. Thanks to Mathieu Doray. Resolved by tchemit.
o Erreur à la création d'une nouvelle mission Issue: 4445. Thanks to Tony Chemit. Resolved by tchemit.
Changes:
o Updates I18n to 3.0 and all the nuiton-xxx libs Issue: 4425. Thanks to Tony Chemit. Resolved by tchemit.
o Updates mavenpom to 4.7 Issue: 4061. Thanks to Tony Chemit. Resolved by tchemit.
o Updates to topia 3.0 Issue: 4062. Thanks to Tony Chemit. Resolved by tchemit.
Downloads
---------
For a manual installation, you can download files here:
https://forge.codelutin.com/projects/echobase/files
* echobase-embedded-2.5.2.zip - https://forge.codelutin.com/attachments/download/1450
* echobase-full-2.5.2.war - https://forge.codelutin.com/attachments/download/1451
Maven artifacts
---------------
Artifacts are deployed in nuiton maven repository
http://maven.nuiton.org/other-releases/
Have fun!
-EchoBase team
1
0