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

r586 - trunk/src/site
by tchemit＠users.forge.codelutin.com 31 Aug '12

31 Aug '12

Author: tchemit Date: 2012-08-31 15:09:10 +0200 (Fri, 31 Aug 2012) New Revision: 586 Url: http://forge.codelutin.com/repositories/revision/echobase/586 Log: fix site css Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-08-31 10:07:10 UTC (rev 585) +++ trunk/src/site/site_en.xml 2012-08-31 13:09:10 UTC (rev 586) @@ -79,7 +79,7 @@ </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> </head> <links> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-31 10:07:10 UTC (rev 585) +++ trunk/src/site/site_fr.xml 2012-08-31 13:09:10 UTC (rev 586) @@ -80,7 +80,7 @@ </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> </head> <links>

1 0

r585 - trunk/src/site
by tchemit＠users.forge.codelutin.com 31 Aug '12

31 Aug '12

Author: tchemit Date: 2012-08-31 12:07:10 +0200 (Fri, 31 Aug 2012) New Revision: 585 Url: http://forge.codelutin.com/repositories/revision/echobase/585 Log: fix sites Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-08-31 09:59:05 UTC (rev 584) +++ trunk/src/site/site_en.xml 2012-08-31 10:07:10 UTC (rev 585) @@ -44,7 +44,7 @@ <bannerLeft> <name>${project.name}</name> <src>${project.url}/images/echobase-logo.png</src> - <href>${project.url}/en/index.html</href> + <href>./index.html</href> </bannerLeft> <publishDate position="right" format="yyyy-MM-dd"/> @@ -69,7 +69,6 @@ <logo href="http://argouml.tigris.org/" name="ArgoUML" img="http://maven-site.chorem.org/public/images/logos/argouml-logo.png"/> - </poweredBy> <body> @@ -90,8 +89,7 @@ </links> <breadcrumbs> - <item name="${project.name}" - href="${project.url}/en/index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <menu name="Language"> @@ -103,7 +101,7 @@ <item name="Home" href="index.html"/> <item name="Installation" href="install.html"/> <item name="Embbeded Application" href="embedded.html"/> - <item name="imports" href="imports.html"/> + <item name="Imports" href="imports.html"/> <item name="Model" href="model.html"/> <item name="Download" href="http://forge.codelutin.com/projects/echobase/files"/> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-31 09:59:05 UTC (rev 584) +++ trunk/src/site/site_fr.xml 2012-08-31 10:07:10 UTC (rev 585) @@ -44,7 +44,7 @@ <bannerLeft> <name>${project.name}</name> <src>${project.url}/images/echobase-logo.png</src> - <href>${project.url}/index.html</href> + <href>./index.html</href> </bannerLeft> <publishDate position="right" format="dd/MM/yyyy"/> @@ -90,8 +90,7 @@ </links> <breadcrumbs> - <item name="${project.name}" - href="${project.url}/index.html"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <menu name="Language"> @@ -103,8 +102,8 @@ <item name="Accueil" href="index.html"/> <item name="Installation" href="install.html"/> <item name="Application embarquée" href="embedded.html"/> - <item name="Les imports" href="imports.html"/> - <item name="Le modèle" href="model.html"/> + <item name="Imports" href="imports.html"/> + <item name="Modèle" href="model.html"/> <item name="Téléchargement" href="http://forge.codelutin.com/projects/echobase/files"/> <item name="Roadmap"

1 0

r584 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/resources echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery echobase-ui/src/main/java/fr/ifremer/echobase/ui src/site/en/resources src/site/en/resources/images src/site/en/resources/model
by tchemit＠users.forge.codelutin.com 31 Aug '12

31 Aug '12

Author: tchemit Date: 2012-08-31 11:59:05 +0200 (Fri, 31 Aug 2012) New Revision: 584 Url: http://forge.codelutin.com/repositories/revision/echobase/584 Log: add missing svn properties and license header Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseEntityHelper.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/JdbcConfiguration.java trunk/echobase-entities/src/main/resources/echobase-datadb.properties trunk/echobase-entities/src/main/resources/echobase-internaldb.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/GenericSQLQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java trunk/src/site/en/resources/echobase.properties trunk/src/site/en/resources/images/echobase-logo.png trunk/src/site/en/resources/model/Transverse.png trunk/src/site/en/resources/model/dataAcoustic.png trunk/src/site/en/resources/model/dataCatches.png trunk/src/site/en/resources/model/dataCategory.png trunk/src/site/en/resources/model/dataCommon.png trunk/src/site/en/resources/model/dataEchotype.png trunk/src/site/en/resources/model/dataLengthAgeKey.png trunk/src/site/en/resources/model/dataLengthWeightKey.png trunk/src/site/en/resources/model/referenceAcousticInstrument.png trunk/src/site/en/resources/model/referenceAll.png trunk/src/site/en/resources/model/referenceAreaOfOperation.png trunk/src/site/en/resources/model/referenceCellType.png trunk/src/site/en/resources/model/referenceDataMetadata.png trunk/src/site/en/resources/model/referenceDataQuality.png trunk/src/site/en/resources/model/referenceDepthStratum.png trunk/src/site/en/resources/model/referenceEchotype.png trunk/src/site/en/resources/model/referenceGear.png trunk/src/site/en/resources/model/referenceLengthAgeKey.png trunk/src/site/en/resources/model/referenceLengthWeightKey.png trunk/src/site/en/resources/model/referenceMission.png trunk/src/site/en/resources/model/referenceOperation.png trunk/src/site/en/resources/model/referenceProtocole.png trunk/src/site/en/resources/model/referenceReferenceDatum.png trunk/src/site/en/resources/model/referenceSample.png trunk/src/site/en/resources/model/referenceSpecies.png trunk/src/site/en/resources/model/referenceStrata.png trunk/src/site/en/resources/model/referenceTSParameter.png trunk/src/site/en/resources/model/referenceVessel.png trunk/src/site/en/resources/model/referenceWeightLengthKey.png Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseEntityHelper.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseEntityHelper.java 2012-08-31 09:57:56 UTC (rev 583) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseEntityHelper.java 2012-08-31 09:59:05 UTC (rev 584) @@ -1,5 +1,28 @@ package fr.ifremer.echobase; +/* + * #%L + * EchoBase :: Entities + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Transaction; Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseEntityHelper.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/JdbcConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/JdbcConfiguration.java 2012-08-31 09:57:56 UTC (rev 583) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/JdbcConfiguration.java 2012-08-31 09:59:05 UTC (rev 584) @@ -2,7 +2,7 @@ * #%L * T3 :: Domain * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2010 - 2012 IRD, Codelutin, Tony Chemit * %% Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/JdbcConfiguration.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-entities/src/main/resources/echobase-datadb.properties =================================================================== --- trunk/echobase-entities/src/main/resources/echobase-datadb.properties 2012-08-31 09:57:56 UTC (rev 583) +++ trunk/echobase-entities/src/main/resources/echobase-datadb.properties 2012-08-31 09:59:05 UTC (rev 584) @@ -2,7 +2,7 @@ # #%L # T3 :: Domain # $Id$ -# $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-domain/src/main/resources/t3-data… $ +# $HeadURL$ # %% # Copyright (C) 2010 - 2012 IRD, Codelutin, Tony Chemit # %% Property changes on: trunk/echobase-entities/src/main/resources/echobase-datadb.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-entities/src/main/resources/echobase-internaldb.properties =================================================================== --- trunk/echobase-entities/src/main/resources/echobase-internaldb.properties 2012-08-31 09:57:56 UTC (rev 583) +++ trunk/echobase-entities/src/main/resources/echobase-internaldb.properties 2012-08-31 09:59:05 UTC (rev 584) @@ -2,7 +2,7 @@ # #%L # T3 :: Domain # $Id$ -# $HeadURL: https://svn.mpl.ird.fr/osiris/t3/trunk/t3-domain/src/main/resources/t3-inte… $ +# $HeadURL$ # %% # Copyright (C) 2010 - 2012 IRD, Codelutin, Tony Chemit # %% Property changes on: trunk/echobase-entities/src/main/resources/echobase-internaldb.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryCsvModel.java 2012-08-31 09:57:56 UTC (rev 583) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryCsvModel.java 2012-08-31 09:59:05 UTC (rev 584) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.services.exportquery; +/* + * #%L + * EchoBase :: Services + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.echobase.csv.EchoBaseCsvUtil; import org.nuiton.util.csv.ext.AbstractExportModel; Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryCsvModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/GenericSQLQuery.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/GenericSQLQuery.java 2012-08-31 09:57:56 UTC (rev 583) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/GenericSQLQuery.java 2012-08-31 09:59:05 UTC (rev 584) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.services.exportquery; +/* + * #%L + * EchoBase :: Services + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/GenericSQLQuery.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2012-08-31 09:57:56 UTC (rev 583) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2012-08-31 09:59:05 UTC (rev 584) @@ -2,8 +2,8 @@ * #%L * EchoBase :: UI * - * $Id: EchoBaseTopiaTransactionFilter.java 488 2012-04-04 14:04:32Z tchemit $ - * $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/java… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin * %% Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java 2012-08-31 09:57:56 UTC (rev 583) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java 2012-08-31 09:59:05 UTC (rev 584) @@ -1,5 +1,28 @@ package fr.ifremer.echobase.ui; +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/src/site/en/resources/echobase.properties =================================================================== --- trunk/src/site/en/resources/echobase.properties 2012-08-31 09:57:56 UTC (rev 583) +++ trunk/src/site/en/resources/echobase.properties 2012-08-31 09:59:05 UTC (rev 584) @@ -3,7 +3,7 @@ # EchoBase # # $Id$ -# $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/src/site/resources/echoba… $ +# $HeadURL$ # %% # Copyright (C) 2011 Ifremer, Codelutin # %% Property changes on: trunk/src/site/en/resources/echobase.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/images/echobase-logo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/Transverse.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/dataAcoustic.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/dataCatches.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/dataCategory.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/dataCommon.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/dataEchotype.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/dataLengthAgeKey.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/dataLengthWeightKey.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceAcousticInstrument.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceAll.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceAreaOfOperation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceCellType.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceDataMetadata.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceDataQuality.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceDepthStratum.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceEchotype.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceGear.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceLengthAgeKey.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceLengthWeightKey.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceMission.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceOperation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceProtocole.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceReferenceDatum.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceSample.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceSpecies.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceStrata.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceTSParameter.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceVessel.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/resources/model/referenceWeightLengthKey.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r583 - trunk/src/site
by tchemit＠users.forge.codelutin.com 31 Aug '12

31 Aug '12

Author: tchemit Date: 2012-08-31 11:57:56 +0200 (Fri, 31 Aug 2012) New Revision: 583 Url: http://forge.codelutin.com/repositories/revision/echobase/583 Log: add locale in any generated page Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-08-31 09:54:47 UTC (rev 582) +++ trunk/src/site/site_en.xml 2012-08-31 09:57:56 UTC (rev 583) @@ -126,8 +126,7 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - locale='en'> + piwikId='${project.piwikId}' locale='en'> </div> </footer> </body> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-31 09:54:47 UTC (rev 582) +++ trunk/src/site/site_fr.xml 2012-08-31 09:57:56 UTC (rev 583) @@ -126,7 +126,7 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' locale='fr'> </div> </footer> </body>

1 0

r582 - in trunk: echobase-services echobase-ui
by tchemit＠users.forge.codelutin.com 31 Aug '12

31 Aug '12

Author: tchemit Date: 2012-08-31 11:54:47 +0200 (Fri, 31 Aug 2012) New Revision: 582 Url: http://forge.codelutin.com/repositories/revision/echobase/582 Log: optimize dependencies Modified: trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-08-31 09:41:24 UTC (rev 581) +++ trunk/echobase-services/pom.xml 2012-08-31 09:54:47 UTC (rev 582) @@ -121,7 +121,7 @@ <artifactId>nuiton-i18n</artifactId> </dependency> -  +  <dependency> <groupId>org.apache.commons</groupId> @@ -129,11 +129,6 @@ </dependency> <dependency> - <groupId>net.sourceforge.javacsv</groupId> - <artifactId>javacsv</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-08-31 09:41:24 UTC (rev 581) +++ trunk/echobase-ui/pom.xml 2012-08-31 09:54:47 UTC (rev 582) @@ -242,11 +242,6 @@ <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> -  <dependency>

1 0

r581 - trunk/src/site
by tchemit＠users.forge.codelutin.com 31 Aug '12

31 Aug '12

Author: tchemit Date: 2012-08-31 11:41:24 +0200 (Fri, 31 Aug 2012) New Revision: 581 Url: http://forge.codelutin.com/repositories/revision/echobase/581 Log: add locale for scmwebditor url generation Modified: trunk/src/site/site_en.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-08-31 09:24:36 UTC (rev 580) +++ trunk/src/site/site_en.xml 2012-08-31 09:41:24 UTC (rev 581) @@ -126,7 +126,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + locale='en'> </div> </footer> </body>

1 0

r580 - trunk/src/site
by tchemit＠users.forge.codelutin.com 31 Aug '12

31 Aug '12

Author: tchemit Date: 2012-08-31 11:24:36 +0200 (Fri, 31 Aug 2012) New Revision: 580 Url: http://forge.codelutin.com/repositories/revision/echobase/580 Log: use last mavnepom-site js Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-08-31 09:23:52 UTC (rev 579) +++ trunk/src/site/site_en.xml 2012-08-31 09:24:36 UTC (rev 580) @@ -76,7 +76,7 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-31 09:23:52 UTC (rev 579) +++ trunk/src/site/site_fr.xml 2012-08-31 09:24:36 UTC (rev 580) @@ -76,7 +76,7 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css"

1 0

r579 - in trunk: . echobase-entities echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/java/fr/ifremer/echobase/entities echobase-entities/src/main/xmi
by tchemit＠users.forge.codelutin.com 31 Aug '12

31 Aug '12

Author: tchemit Date: 2012-08-31 11:23:52 +0200 (Fri, 31 Aug 2012) New Revision: 579 Url: http://forge.codelutin.com/repositories/revision/echobase/579 Log: refs #1438: split in tow model (for the two db) Added: trunk/echobase-entities/src/main/xmi/echobase-internal.properties trunk/echobase-entities/src/main/xmi/echobase-internal.zargo Modified: trunk/echobase-entities/pom.xml trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseDbMeta.java trunk/echobase-entities/src/main/xmi/echobase.properties trunk/echobase-entities/src/main/xmi/echobase.zargo trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-08-31 08:45:09 UTC (rev 578) +++ trunk/echobase-entities/pom.xml 2012-08-31 09:23:52 UTC (rev 579) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>  @@ -42,16 +44,45 @@ <executions> <execution> <phase>generate-sources</phase> - <id>generate-persistence</id> + <id>zargo-to-objectmodel</id> <configuration> + <skipInputs>model</skipInputs> <inputs> - <input>src/main/xmi:echobase.zargo</input> + <input>zargo</input> </inputs> </configuration> <goals> <goal>generate</goal> </goals> </execution> + <execution> + <phase>generate-sources</phase> + <id>generate-entities</id> + <configuration> + <inputs> + <input> + target/generated-sources/models:echobase.objectmodel + </input> + </inputs> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <phase>generate-sources</phase> + <id>generate-internal-entities</id> + <configuration> + <inputs> + <input> + target/generated-sources/models:echobase-internal.objectmodel + </input> + </inputs> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> </executions> <dependencies> <dependency> Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-08-31 08:45:09 UTC (rev 578) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseDecoratorProvider.java 2012-08-31 09:23:52 UTC (rev 579) @@ -25,6 +25,7 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.ExportQuery; +import fr.ifremer.echobase.entities.WorkingDbConfiguration; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Data; @@ -101,6 +102,9 @@ // ExportQuery decorator registerJXPathDecorator(locale, ExportQuery.class, "${name}$s - ${description}$s"); + // WorkingDbConfiguration decorator + registerJXPathDecorator(locale, WorkingDbConfiguration.class, "${url}$s - ${login}$s (${description}$s)"); + // AcousticInstrument decorator registerJXPathDecorator(locale, AcousticInstrument.class, "${id}$s"); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseDbMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseDbMeta.java 2012-08-31 08:45:09 UTC (rev 578) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseDbMeta.java 2012-08-31 09:23:52 UTC (rev 579) @@ -127,10 +127,7 @@ EchoBaseDbMeta(EchoBasePersistenceHelper persistenceHelper) { super(persistenceHelper, - EchoBaseEntityEnum.values(), - EchoBaseEntityEnum.EchoBaseUser, - EchoBaseEntityEnum.EntityModificationLog, - EchoBaseEntityEnum.ExportQuery); + EchoBaseEntityEnum.values(), EchoBaseEntityEnum.EntityModificationLog); { Copied: trunk/echobase-entities/src/main/xmi/echobase-internal.properties (from rev 573, trunk/echobase-entities/src/main/xmi/echobase.properties) =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase-internal.properties (rev 0) +++ trunk/echobase-entities/src/main/xmi/echobase-internal.properties 2012-08-31 09:23:52 UTC (rev 579) @@ -0,0 +1,68 @@ +### +# #%L +# EchoBase :: Entities +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2011 Ifremer, Codelutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### + +model.tagValue.notGenerateToString=true +model.tagValue.generateOperatorForDAOHelper=true +model.tagValue.generateStandaloneEnumForDAOHelper=true +model.tagValue.constantPrefix=PROPERTY_ +model.tagValue.version=1.1 +model.tagValue.noPCS=true +model.tagValue.doNotGenerateBooleanGetMethods=true +model.tagValue.indexForeignKeys=true + +############################################################################### +### Ordered attributes ######################################################## +############################################################################### + +############################################################################### +### Unique attributes ######################################################### +############################################################################### + +############################################################################### +### Big Text attributes ####################################################### +############################################################################### + +fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagvalue.type=text + +############################################################################### +### Natural id ############################################################### +############################################################################### + +fr.ifremer.echobase.entities.EchoBaseUser.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.naturalId=true +fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.notNull=true +fr.ifremer.echobase.entities.EchoBaseUser.attribute.password.tagValue.notNull=true + +fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.ExportQuery.attribute.name.tagValue.naturalId=true +fr.ifremer.echobase.entities.ExportQuery.attribute.description.tagValue.notNull=true +fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagValue.notNull=true +fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedDate.tagValue.notNull=true +fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedUser.tagValue.notNull=true + +fr.ifremer.echobase.entities.WorkingDbConfiguration.class.tagValue.naturalIdMutable=true +fr.ifremer.echobase.entities.WorkingDbConfiguration.attribute.url.tagValue.naturalId=true +fr.ifremer.echobase.entities.WorkingDbConfiguration.attribute.url.tagValue.notNull=true +fr.ifremer.echobase.entities.WorkingDbConfiguration.attribute.login.tagValue.naturalId=true +fr.ifremer.echobase.entities.WorkingDbConfiguration.attribute.login.tagValue.notNull=true \ No newline at end of file Copied: trunk/echobase-entities/src/main/xmi/echobase-internal.zargo (from rev 573, trunk/echobase-entities/src/main/xmi/echobase.zargo) =================================================================== (Binary files differ) Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-08-31 08:45:09 UTC (rev 578) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-08-31 09:23:52 UTC (rev 579) @@ -22,12 +22,11 @@ # #L% ### -#model.tagValue.i18n=echobase.common. model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true model.tagValue.generateStandaloneEnumForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=1.0 +model.tagValue.version=1.1 model.tagValue.noPCS=true model.tagValue.doNotGenerateBooleanGetMethods=true model.tagValue.indexForeignKeys=true @@ -55,30 +54,17 @@ ############################################################################### fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagvalue.type=text -fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagvalue.type=text ############################################################################### ### Natural id for references ################################################ ############################################################################### -fr.ifremer.echobase.entities.EchoBaseUser.class.tagValue.naturalIdMutable=true -fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.naturalId=true -fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.notNull=true -fr.ifremer.echobase.entities.EchoBaseUser.attribute.password.tagValue.notNull=true - fr.ifremer.echobase.entities.EntityModificationLog.attribute.entityType.tagValue.notNull=true fr.ifremer.echobase.entities.EntityModificationLog.attribute.entityId.tagValue.notNull=true fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagValue.notNull=true fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationDate.tagValue.notNull=true fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationUser.tagValue.notNull=true -fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=true -fr.ifremer.echobase.entities.ExportQuery.attribute.name.tagValue.naturalId=true -fr.ifremer.echobase.entities.ExportQuery.attribute.description.tagValue.notNull=true -fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagValue.notNull=true -fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedDate.tagValue.notNull=true -fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedUser.tagValue.notNull=true - fr.ifremer.echobase.entities.references.AcousticInstrument.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.AcousticInstrument.attribute.id.tagValue.naturalId=true fr.ifremer.echobase.entities.references.AcousticInstrument.attribute.id.tagValue.notNull=true Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-31 08:45:09 UTC (rev 578) +++ trunk/pom.xml 2012-08-31 09:23:52 UTC (rev 579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.7-SNAPSHOT</version> + <version>3.3.7</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r578 - trunk/src/site
by tchemit＠users.forge.codelutin.com 31 Aug '12

31 Aug '12

Author: tchemit Date: 2012-08-31 10:45:09 +0200 (Fri, 31 Aug 2012) New Revision: 578 Url: http://forge.codelutin.com/repositories/revision/echobase/578 Log: use fluido 1.3.0 Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-08-30 16:49:17 UTC (rev 577) +++ trunk/src/site/site_en.xml 2012-08-31 08:45:09 UTC (rev 578) @@ -28,7 +28,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-30 16:49:17 UTC (rev 577) +++ trunk/src/site/site_fr.xml 2012-08-31 08:45:09 UTC (rev 578) @@ -28,7 +28,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom>

1 0

r577 - in trunk: echobase-entities echobase-services echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 18:49:17 +0200 (Thu, 30 Aug 2012) New Revision: 577 Url: http://forge.codelutin.com/repositories/revision/echobase/577 Log: no site deployed Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-08-30 16:47:46 UTC (rev 576) +++ trunk/echobase-entities/pom.xml 2012-08-30 16:49:17 UTC (rev 577) @@ -20,6 +20,7 @@ <properties>  <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip> </properties> <build> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-08-30 16:47:46 UTC (rev 576) +++ trunk/echobase-services/pom.xml 2012-08-30 16:49:17 UTC (rev 577) @@ -17,6 +17,7 @@ <properties>  <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip> </properties> <build> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-08-30 16:47:46 UTC (rev 576) +++ trunk/echobase-tools/pom.xml 2012-08-30 16:49:17 UTC (rev 577) @@ -28,6 +28,7 @@  <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip> </properties> <build> <pluginManagement> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-08-30 16:47:46 UTC (rev 576) +++ trunk/echobase-ui/pom.xml 2012-08-30 16:49:17 UTC (rev 577) @@ -21,6 +21,7 @@  <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip>  <i18n.bundleOutputName>${echobaseI18nBundle}</i18n.bundleOutputName>

1 0