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

r791 - in trunk: echobase-domain/src/license echobase-services/src/license echobase-tools/src/license echobase-ui/src/license
by maven-release＠users.forge.codelutin.com Jan. 15, 2013

Jan. 15, 2013

Author: maven-release Date: 2013-01-15 11:34:05 +0100 (Tue, 15 Jan 2013) New Revision: 791 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/791 Log: update dependencies and plugins Modified: trunk/echobase-domain/src/license/THIRD-PARTY.properties trunk/echobase-services/src/license/THIRD-PARTY.properties trunk/echobase-tools/src/license/THIRD-PARTY.properties trunk/echobase-ui/src/license/THIRD-PARTY.properties Modified: trunk/echobase-domain/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-domain/src/license/THIRD-PARTY.properties 2013-01-13 11:56:02 UTC (rev 790) +++ trunk/echobase-domain/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) @@ -2,15 +2,16 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -18,8 +19,9 @@ # Please fill the missing licenses for dependencies : # # -#Tue Nov 08 16:07:35 CET 2011 +#Tue Jan 15 11:09:19 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-services/src/license/THIRD-PARTY.properties 2013-01-13 11:56:02 UTC (rev 790) +++ trunk/echobase-services/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) @@ -3,15 +3,16 @@ # Already used licenses in project : # - Affero General Public License (AGPL) # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -19,8 +20,9 @@ # Please fill the missing licenses for dependencies : # # -#Thu Nov 03 15:07:32 CET 2011 +#Tue Jan 15 11:09:45 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-tools/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-tools/src/license/THIRD-PARTY.properties 2013-01-13 11:56:02 UTC (rev 790) +++ trunk/echobase-tools/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) @@ -3,7 +3,6 @@ # Already used licenses in project : # - Affero General Public License (AGPL) # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU Library or Lesser General Public License @@ -13,6 +12,7 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -20,8 +20,9 @@ # Please fill the missing licenses for dependencies : # # -#Tue Dec 27 15:42:19 CET 2011 +#Tue Jan 15 11:10:31 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/echobase-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-ui/src/license/THIRD-PARTY.properties 2013-01-13 11:56:02 UTC (rev 790) +++ trunk/echobase-ui/src/license/THIRD-PARTY.properties 2013-01-15 10:34:05 UTC (rev 791) @@ -4,7 +4,6 @@ # - Affero General Public License (AGPL) # - Apache Software License - Version 2.0 # - BSD License -# - BSD style # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 @@ -17,6 +16,7 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - New BSD License # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -25,10 +25,11 @@ # Please fill the missing licenses for dependencies : # # -#Sun Sep 02 17:21:28 CEST 2012 +#Tue Jan 15 11:10:52 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 +regexp--regexp--1.3=The Apache Software License, Version 2.0

1 0

r790 - trunk
by maven-release＠users.forge.codelutin.com Jan. 13, 2013

Jan. 13, 2013

Author: maven-release Date: 2013-01-13 12:56:02 +0100 (Sun, 13 Jan 2013) New Revision: 790 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/790 Log: updtae pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-07 11:18:11 UTC (rev 789) +++ trunk/pom.xml 2013-01-13 11:56:02 UTC (rev 790) @@ -74,7 +74,6 @@ </roles> <timezone>Europe/Paris</timezone> </developer> - </developers> <scm>

1 0

r789 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui resources
by tchemit＠users.forge.codelutin.com Jan. 7, 2013

Jan. 7, 2013

Author: tchemit Date: 2013-01-07 12:18:11 +0100 (Mon, 07 Jan 2013) New Revision: 789 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/789 Log: fixes #1906: Probl?\195?\168me d'encoding dans les fichiers javascripts Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java Modified: trunk/echobase-ui/src/main/resources/struts.xml Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java 2013-01-07 11:18:11 UTC (rev 789) @@ -0,0 +1,134 @@ +package fr.ifremer.echobase.ui; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2013 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import com.google.common.base.Charsets; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import org.apache.commons.io.IOUtils; +import org.apache.struts2.dispatcher.DefaultStaticContentLoader; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Calendar; + + +/** + * To fix some javascript loading problem. + * <p/> + * Some javascript files have some strange first caracter (ckeditor for example) + + * problem while loading charsets for french translate files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class EchoBaseStaticContentLoader extends DefaultStaticContentLoader { + + /** Logger. */ + private final Logger log = + LoggerFactory.getLogger(EchoBaseStaticContentLoader.class); + + @Override + protected void process(InputStream is, + String path, + HttpServletRequest request, + HttpServletResponse response) throws IOException { + if (is != null) { + Calendar cal = Calendar.getInstance(); + + // check for if-modified-since, prior to any other headers + long ifModifiedSince = 0; + try { + ifModifiedSince = request.getDateHeader("If-Modified-Since"); + } catch (Exception e) { + log.warn("Invalid If-Modified-Since header value: '" + + request.getHeader("If-Modified-Since") + "', ignoring"); + } + long lastModifiedMillis = lastModifiedCal.getTimeInMillis(); + long now = cal.getTimeInMillis(); + cal.add(Calendar.DAY_OF_MONTH, 1); + long expires = cal.getTimeInMillis(); + + if (ifModifiedSince > 0 && ifModifiedSince <= lastModifiedMillis) { + // not modified, content is not sent - only basic + // headers and status SC_NOT_MODIFIED + response.setDateHeader("Expires", expires); + response.setStatus(HttpServletResponse.SC_NOT_MODIFIED); + is.close(); + return; + } + + // set the content-type header + String contentType = getContentType(path); + if (contentType != null) { + response.setContentType(contentType); + } + + if (serveStaticBrowserCache) { + // set heading information for caching static content + response.setDateHeader("Date", now); + response.setDateHeader("Expires", expires); + response.setDateHeader("Retry-After", expires); + response.setHeader("Cache-Control", "public"); + response.setDateHeader("Last-Modified", lastModifiedMillis); + } else { + response.setHeader("Cache-Control", "no-cache"); + response.setHeader("Pragma", "no-cache"); + response.setHeader("Expires", "-1"); + } + + try { + copy(is, response.getOutputStream(), path); + + } finally { + is.close(); + } + } + } + + protected void copy(InputStream input, + OutputStream output, + String path) throws IOException { + + if (path.contains(".js")) { + String content = IOUtils.toString(input); + if (content.indexOf("/") == 1) { + // fix nasty first strange caracter for ckeditor (only on firefox :() + content = content.substring(1); + } + if (log.isDebugEnabled()) { + log.info("Content:\n" + content); + } + // always want to have file in IS0 (even if we serve UTF8 files) + IOUtils.write(content, output, Charsets.ISO_8859_1); + } else { + + // no special tratment for other files + IOUtils.copy(input, output); + } + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseStaticContentLoader.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-12-29 13:13:55 UTC (rev 788) +++ trunk/echobase-ui/src/main/resources/struts.xml 2013-01-07 11:18:11 UTC (rev 789) @@ -30,6 +30,9 @@ <struts> + <bean type="org.apache.struts2.dispatcher.StaticContentLoader" + class="fr.ifremer.echobase.ui.EchoBaseStaticContentLoader" name="default" /> + <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider"/>

1 0

r788 - trunk
by tchemit＠users.forge.codelutin.com Dec. 29, 2012

Dec. 29, 2012

Author: tchemit Date: 2012-12-29 14:13:55 +0100 (Sat, 29 Dec 2012) New Revision: 788 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/788 Log: Update mavenpom4redmine to 3.4.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-14 16:56:47 UTC (rev 787) +++ trunk/pom.xml 2012-12-29 13:13:55 UTC (rev 788) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.4</version> + <version>3.4.7</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r787 - trunk/src/site/en/rst
by mdoray＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: mdoray Date: 2012-12-14 17:56:47 +0100 (Fri, 14 Dec 2012) New Revision: 787 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/787 Log: >From scmwebeditor -- Modified: trunk/src/site/en/rst/index.rst Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2012-11-25 11:42:20 UTC (rev 786) +++ trunk/src/site/en/rst/index.rst 2012-12-14 16:56:47 UTC (rev 787) @@ -31,15 +31,22 @@ 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) +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. -This site describes the Echobase database. If you are interested in geoR, please visit the `Ifremer forge`_. +This site describes the Echobase database. If you are interested in EchoR, please visit the `Ifremer forge`_. -Echobase provide a web-browser interface for importing, editing and querying data, -large storage capacities, and an easy integration into Geographical Information Systems or dynamic websites. -The Echobase acoustic metadata format follows the `ICES WGFAST`_ Topic Group on metadata standards recommendations. +EchoBase is built upon an open source PostgreSQL database, ensuring large storage capacities and easy integration into Geographical Information Systems or dynamic websites. +It has been designed to store data collected during both acoustic and bottom trawl based ecosystemic cruises. +The EchoBase data model is based on the `ICES WGFAST`_ Topic Group on metadata standards recommendations1. +It comprised a main « cruise metadata branch » on which are plugged acoustic and fishing (« Operation ») data. +Biomass estimation results can also be stored in the database at both the acoustic cell (small scale results) and voyage (large scale results)levels. +The database also allows for the storage of length-weight and Target Strength-length reference relationships, as well as map data at the voyage level. +EchoBase features a Java web-browser interface for selecting working databases, managing users, importing, editing and querying data. +It also can be easily connected to LibreOffice base or the R statistical software for querying data. +Portable H2 databases can be extracted from the server-based EchoBase instance and stored on a local harddrive. + Documentation -------------

1 0

r786 - in trunk: echobase-domain/src/test/java/fr/ifremer/echobase echobase-domain/src/test/java/fr/ifremer/echobase/persistence echobase-services/src/test/java/fr/ifremer/echobase/services echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata
by tchemit＠users.forge.codelutin.com Nov. 25, 2012

Nov. 25, 2012

Author: tchemit Date: 2012-11-25 12:42:20 +0100 (Sun, 25 Nov 2012) New Revision: 786 Url: http://forge.codelutin.com/repositories/revision/echobase/786 Log: replace usage of deprecated API Modified: trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java Modified: trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java =================================================================== --- trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java 2012-11-25 11:29:52 UTC (rev 785) +++ trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java 2012-11-25 11:42:20 UTC (rev 786) @@ -24,10 +24,10 @@ import fr.ifremer.echobase.entities.EntityModificationLog; import fr.ifremer.echobase.entities.EntityModificationLogImpl; -import junit.framework.Assert; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; +import org.junit.Assert; import org.junit.Test; import java.util.Calendar; Modified: trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java =================================================================== --- trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java 2012-11-25 11:29:52 UTC (rev 785) +++ trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java 2012-11-25 11:42:20 UTC (rev 786) @@ -26,7 +26,7 @@ import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.Mission; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.topia.persistence.TopiaEntity; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java 2012-11-25 11:29:52 UTC (rev 785) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java 2012-11-25 11:42:20 UTC (rev 786) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import org.nuiton.util.decorator.Decorator; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java 2012-11-25 11:29:52 UTC (rev 785) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java 2012-11-25 11:42:20 UTC (rev 786) @@ -42,12 +42,11 @@ import fr.ifremer.echobase.io.EchoBaseIOUtil; import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import junit.framework.Assert; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.csv.in.TopiaCsvImports; import org.nuiton.topia.persistence.metadata.TableMeta; 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 2012-11-25 11:29:52 UTC (rev 785) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2012-11-25 11:42:20 UTC (rev 786) @@ -93,8 +93,8 @@ import fr.ifremer.echobase.services.importdata.ResultsVoyageImportService; import fr.ifremer.echobase.services.removedata.RemoveDataConfiguration; import fr.ifremer.echobase.services.removedata.RemoveDataService; -import junit.framework.Assert; import org.apache.commons.collections.CollectionUtils; +import org.junit.Assert; import org.junit.Before; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO;

1 0

r785 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com Nov. 25, 2012

Nov. 25, 2012

Author: tchemit Date: 2012-11-25 12:29:52 +0100 (Sun, 25 Nov 2012) New Revision: 785 Url: http://forge.codelutin.com/repositories/revision/echobase/785 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2012-11-25 11:29:43 UTC (rev 784) +++ trunk/echobase-domain/pom.xml 2012-11-25 11:29:52 UTC (rev 785) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-11-25 11:29:43 UTC (rev 784) +++ trunk/echobase-services/pom.xml 2012-11-25 11:29:52 UTC (rev 785) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-11-25 11:29:43 UTC (rev 784) +++ trunk/echobase-tools/pom.xml 2012-11-25 11:29:52 UTC (rev 785) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-11-25 11:29:43 UTC (rev 784) +++ trunk/echobase-ui/pom.xml 2012-11-25 11:29:52 UTC (rev 785) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-25 11:29:43 UTC (rev 784) +++ trunk/pom.xml 2012-11-25 11:29:52 UTC (rev 785) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2</version> + <version>2.0-SNAPSHOT</version> <modules> <module>echobase-domain</module> @@ -78,12 +78,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0-rc-2</url> + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0-rc-2 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0-rc-2 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r784 - tags
by tchemit＠users.forge.codelutin.com Nov. 25, 2012

Nov. 25, 2012

Author: tchemit Date: 2012-11-25 12:29:43 +0100 (Sun, 25 Nov 2012) New Revision: 784 Url: http://forge.codelutin.com/repositories/revision/echobase/784 Log: [maven-release-plugin] copy for tag echobase-2.0-rc-2 Added: tags/echobase-2.0-rc-2/

1 0

r783 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com Nov. 25, 2012

Nov. 25, 2012

Author: tchemit Date: 2012-11-25 12:29:35 +0100 (Sun, 25 Nov 2012) New Revision: 783 Url: http://forge.codelutin.com/repositories/revision/echobase/783 Log: [maven-release-plugin] prepare release echobase-2.0-rc-2 Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2012-11-25 11:26:06 UTC (rev 782) +++ trunk/echobase-domain/pom.xml 2012-11-25 11:29:35 UTC (rev 783) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2-SNAPSHOT</version> + <version>2.0-rc-2</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-11-25 11:26:06 UTC (rev 782) +++ trunk/echobase-services/pom.xml 2012-11-25 11:29:35 UTC (rev 783) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2-SNAPSHOT</version> + <version>2.0-rc-2</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-11-25 11:26:06 UTC (rev 782) +++ trunk/echobase-tools/pom.xml 2012-11-25 11:29:35 UTC (rev 783) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2-SNAPSHOT</version> + <version>2.0-rc-2</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-11-25 11:26:06 UTC (rev 782) +++ trunk/echobase-ui/pom.xml 2012-11-25 11:29:35 UTC (rev 783) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2-SNAPSHOT</version> + <version>2.0-rc-2</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-25 11:26:06 UTC (rev 782) +++ trunk/pom.xml 2012-11-25 11:29:35 UTC (rev 783) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2-SNAPSHOT</version> + <version>2.0-rc-2</version> <modules> <module>echobase-domain</module> @@ -78,12 +78,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0-rc-2</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0-rc-2 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-2.0-rc-2 </developerConnection> </scm>

1 0

r782 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com Nov. 25, 2012

Nov. 25, 2012

Author: tchemit Date: 2012-11-25 12:26:06 +0100 (Sun, 25 Nov 2012) New Revision: 782 Url: http://forge.codelutin.com/repositories/revision/echobase/782 Log: back to snapshot Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2012-11-25 11:16:13 UTC (rev 781) +++ trunk/echobase-domain/pom.xml 2012-11-25 11:26:06 UTC (rev 782) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2</version> + <version>2.0-rc-2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-11-25 11:16:13 UTC (rev 781) +++ trunk/echobase-services/pom.xml 2012-11-25 11:26:06 UTC (rev 782) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2</version> + <version>2.0-rc-2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-11-25 11:16:13 UTC (rev 781) +++ trunk/echobase-tools/pom.xml 2012-11-25 11:26:06 UTC (rev 782) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2</version> + <version>2.0-rc-2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-11-25 11:16:13 UTC (rev 781) +++ trunk/echobase-ui/pom.xml 2012-11-25 11:26:06 UTC (rev 782) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2</version> + <version>2.0-rc-2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-25 11:16:13 UTC (rev 781) +++ trunk/pom.xml 2012-11-25 11:26:06 UTC (rev 782) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.0-rc-2</version> + <version>2.0-rc-2-SNAPSHOT</version> <modules> <module>echobase-domain</module>

1 0