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

r856 - in trunk: . echobase-ui/src/main/resources echobase-ui/src/main/resources/config
by tchemit＠users.forge.codelutin.com Oct. 20, 2013

Oct. 20, 2013

Author: tchemit Date: 2013-10-20 17:28:07 +0200 (Sun, 20 Oct 2013) New Revision: 856 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/856 Log: fixes #3552: Updates struts to 2.3.15.3 Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/struts.xml trunk/pom.xml Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2013-10-20 13:45:37 UTC (rev 855) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2013-10-20 15:28:07 UTC (rev 856) @@ -31,6 +31,14 @@ <package name="user" extends="loggued" namespace="/user"> +  + <action name="loginInput" class="fr.ifremer.echobase.ui.actions.user.Login" + method="input"> + <result name="input">/WEB-INF/jsp/user/login.jsp</result> + <result name="redirect" type="redirect">${redirectAction}</result> + <interceptor-ref name="echobaseDefaultStack"/> + </action> +  <action name="login" class="fr.ifremer.echobase.ui.actions.user.Login" method="execute"> @@ -55,8 +63,7 @@ </action>  - <action name="user-*" - class="fr.ifremer.echobase.ui.actions.user.{1}"> + <action name="user-*" class="fr.ifremer.echobase.ui.actions.user.{1}"> <interceptor-ref name="checkUserIsAdmin"/> <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/user/{1}.jsp</result> Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2013-10-20 13:45:37 UTC (rev 855) +++ trunk/echobase-ui/src/main/resources/struts.xml 2013-10-20 15:28:07 UTC (rev 856) @@ -38,6 +38,9 @@ name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider"/> + <constant name="struts.enable.DynamicMethodInvocation" value="true"/> + <constant name="struts.mapper.action.prefix.enabled" value="true"/> + <constant name="struts.xworkTextProvider" value="i18nTextProvider"/> <constant name="struts.ognl.allowStaticMethodAccess" value="true"/> @@ -81,7 +84,7 @@  <interceptor name="checkUserLoggued" class="fr.ifremer.echobase.ui.interceptors.CheckLogguedInterceptor"> - <param name="loginAction">user/login!input</param> + <param name="loginAction">user/loginInput</param> <param name="redirectAction">/home</param> </interceptor> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-20 13:45:37 UTC (rev 855) +++ trunk/pom.xml 2013-10-20 15:28:07 UTC (rev 856) @@ -145,7 +145,7 @@ <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <nuitonWebVersion>1.14</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.15.1</struts2Version> + <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.6.0</jqueryPluginVersion> <h2Version>1.3.173</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>

1 0

r855 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui
by tchemit＠users.forge.codelutin.com Oct. 20, 2013

Oct. 20, 2013

Author: tchemit Date: 2013-10-20 15:45:37 +0200 (Sun, 20 Oct 2013) New Revision: 855 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/855 Log: improve init code Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 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 2013-10-19 13:06:51 UTC (rev 854) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2013-10-20 13:45:37 UTC (rev 855) @@ -27,6 +27,8 @@ import com.google.common.collect.Sets; import com.opensymphony.xwork2.ActionContext; import fr.ifremer.echobase.config.EchoBaseConfiguration; +import fr.ifremer.echobase.entities.DriverType; +import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.TopiaEchoBaseInternalPersistenceContext; import fr.ifremer.echobase.entities.TopiaEchoBasePersistenceContext; import fr.ifremer.echobase.entities.spatial.SpatialDataCache; @@ -35,6 +37,9 @@ import fr.ifremer.echobase.persistence.EchobaseTopiaContexts; import fr.ifremer.echobase.services.DefaultEchoBaseServiceContext; import fr.ifremer.echobase.services.EchoBaseServiceContext; +import fr.ifremer.echobase.services.service.UserService; +import fr.ifremer.echobase.services.service.embeddedapplication.EmbeddedApplicationService; +import fr.ifremer.echobase.services.service.workingDb.WorkingDbConfigurationService; import fr.ird.converter.FloatConverter; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; @@ -44,11 +49,15 @@ import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; import org.nuiton.util.converter.ConverterUtil; import javax.servlet.ServletContext; import java.beans.Introspector; +import java.io.File; +import java.io.IOException; import java.sql.SQLException; +import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -179,6 +188,24 @@ setConfiguration(configuration); setDbMeta(EchoBaseDbMeta.newDbMeta()); setInternalRootContext(internalRootContext); + + // create a service context + EchoBaseServiceContext serviceContext = + DefaultEchoBaseServiceContext.newContext( + Locale.getDefault(), + getConfiguration(), + getDbMeta(), + getSpatialDataCache()); + + // init database (and create minimal admin user if required) + initInternalDatabase(serviceContext); + + // copy drivers if required + try { + copyDriverFiles(serviceContext); + } catch (IOException e) { + throw new TopiaException("Could not install drivers", e); + } } public EchoBaseConfiguration getConfiguration() { @@ -276,4 +303,87 @@ this.configuration = configuration; } + + /** + * Init the internal database, says : + * <ul> + * <li>If no schema found or if asked to updateSchema using the + * {@code updateSchema} configuration option is on.</li> + * <li>If no user found is db, create a administrator user + * {@code admin/admin}</li> + * </ul> + */ + protected void initInternalDatabase(EchoBaseServiceContext serviceContext) throws TopiaException { + + + EchoBaseConfiguration configuration = this.getConfiguration(); + Preconditions.checkNotNull(configuration); + + EchoBaseDbMeta dbMeta = getDbMeta(); + Preconditions.checkNotNull(dbMeta); + + TopiaContext rootContext = this.getInternalRootContext(); + Preconditions.checkNotNull(rootContext); + + if (configuration.isUpdateSchema()) { + if (log.isInfoEnabled()) { + log.info("Will update schema..."); + } + rootContext.updateSchema(); + } + + TopiaContext tx = rootContext.beginTransaction(); + try { + serviceContext.setEchoBaseInternalPersistenceContext(new TopiaEchoBaseInternalPersistenceContext(tx)); + + UserService service = serviceContext.newService(UserService.class); + + List<EchoBaseUser> users = service.getUsers(); + + if (CollectionUtils.isEmpty(users)) { + + // no users in database create the admin user + if (log.isInfoEnabled()) { + log.info("No user in database, will create default " + + "users."); + } + + service.createDefaultUsers(); + } + + if (configuration.isEmbedded()) { + + if (log.isInfoEnabled()) { + log.info("Will try t create default working db " + + "configuration for embedded db."); + } + // try to create a default embedded working db configuration + serviceContext.newService(WorkingDbConfigurationService.class). + createEmbeddedWorkingDbConfiguration(); + } + } finally { + serviceContext.setEchoBaseInternalPersistenceContext(null); + EchoBaseEntityHelper.closeConnection(tx); + } + } + + protected void copyDriverFiles(EchoBaseServiceContext serviceContext) throws IOException { + EmbeddedApplicationService service = + serviceContext.newService(EmbeddedApplicationService.class); + EchoBaseConfiguration configuration = serviceContext.getConfiguration(); + File libDirectory = configuration.getLibDirectory(); + for (DriverType driverType : DriverType.values()) { + String pilotFileName = driverType.getPilotFileName(configuration); + File pilotFile = new File(libDirectory, pilotFileName); + if (!pilotFile.exists()) { + + // copy it from class-path + if (log.isInfoEnabled()) { + log.info("Copy driver " + pilotFileName + + " to directory " + libDirectory); + } + service.copyEmbeddedBinaryFile(pilotFileName, libDirectory); + } + } + } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2013-10-19 13:06:51 UTC (rev 854) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2013-10-20 13:45:37 UTC (rev 855) @@ -23,32 +23,13 @@ */ package fr.ifremer.echobase.ui; -import com.google.common.base.Preconditions; -import fr.ifremer.echobase.config.EchoBaseConfiguration; -import fr.ifremer.echobase.entities.DriverType; -import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.TopiaEchoBaseInternalPersistenceContext; -import fr.ifremer.echobase.persistence.EchoBaseDbMeta; -import fr.ifremer.echobase.persistence.EchoBaseEntityHelper; -import fr.ifremer.echobase.services.DefaultEchoBaseServiceContext; -import fr.ifremer.echobase.services.EchoBaseServiceContext; -import fr.ifremer.echobase.services.service.embeddedapplication.EmbeddedApplicationService; -import fr.ifremer.echobase.services.service.UserService; -import fr.ifremer.echobase.services.service.workingDb.WorkingDbConfigurationService; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import java.io.File; -import java.io.IOException; import java.util.Date; -import java.util.List; -import java.util.Locale; /** * To listen start or end of the application. @@ -99,25 +80,6 @@ sce.getServletContext(), applicationContext); applicationContext.init(); - - // create a service context - EchoBaseServiceContext serviceContext = - DefaultEchoBaseServiceContext.newContext( - Locale.getDefault(), - applicationContext.getConfiguration(), - applicationContext.getDbMeta(), - applicationContext.getSpatialDataCache()); - - // init database (and create minimal admin user if required) - - initInternalDatabase(applicationContext, serviceContext); - - // copy drivers if required - try { - copyDriverFiles(serviceContext); - } catch (IOException e) { - throw new TopiaException("Could not install drivers", e); - } } @Override @@ -136,113 +98,5 @@ EchoBaseApplicationContext.removeApplicationContext(servletContext); applicationContext.close(); - -// // release internal db -// TopiaContext rootContext = -// applicationContext.getInternalRootContext(); -// EchoBaseEntityHelper.releaseRootContext(rootContext); -// finally { - -// // release all user sessions -// Set<EchoBaseSession> sessions = applicationContext.getEchoBaseSessions(); -// if (CollectionUtils.isNotEmpty(sessions)) { -// for (EchoBaseSession session : sessions) { -// applicationContext.destroyEchoBaseSession(session); -// } -// } - -// // see http://wiki.apache.org/commons/Logging/FrequentlyAskedQuestions#A_memory_le… -// ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); -// LogFactory.release(contextClassLoader); -// -// Introspector.flushCaches(); -// } } - - /** - * Init the internal database, says : - * <ul> - * <li>If no schema found or if asked to updateSchema using the - * {@code updateSchema} configuration option is on.</li> - * <li>If no user found is db, create a administrator user - * {@code admin/admin}</li> - * </ul> - * - * @param context application context where to store global internal db root context - */ - protected void initInternalDatabase(EchoBaseApplicationContext context, - EchoBaseServiceContext serviceContext) throws TopiaException { - - Preconditions.checkNotNull(context); - - EchoBaseConfiguration configuration = context.getConfiguration(); - Preconditions.checkNotNull(configuration); - - EchoBaseDbMeta dbMeta = context.getDbMeta(); - Preconditions.checkNotNull(dbMeta); - - TopiaContext rootContext = context.getInternalRootContext(); - Preconditions.checkNotNull(rootContext); - - if (configuration.isUpdateSchema()) { - if (log.isInfoEnabled()) { - log.info("Will update schema..."); - } - rootContext.updateSchema(); - } - - TopiaContext tx = rootContext.beginTransaction(); - try { - serviceContext.setEchoBaseInternalPersistenceContext(new TopiaEchoBaseInternalPersistenceContext(tx)); - - UserService service = serviceContext.newService(UserService.class); - - List<EchoBaseUser> users = service.getUsers(); - - if (CollectionUtils.isEmpty(users)) { - - // no users in database create the admin user - if (log.isInfoEnabled()) { - log.info("No user in database, will create default " + - "users."); - } - - service.createDefaultUsers(); - } - - if (configuration.isEmbedded()) { - - if (log.isInfoEnabled()) { - log.info("Will try t create default working db " + - "configuration for embedded db."); - } - // try to create a default embedded working db configuration - serviceContext.newService(WorkingDbConfigurationService.class). - createEmbeddedWorkingDbConfiguration(); - } - } finally { - serviceContext.setEchoBaseInternalPersistenceContext(null); - EchoBaseEntityHelper.closeConnection(tx); - } - } - - protected void copyDriverFiles(EchoBaseServiceContext serviceContext) throws IOException { - EmbeddedApplicationService service = - serviceContext.newService(EmbeddedApplicationService.class); - EchoBaseConfiguration configuration = serviceContext.getConfiguration(); - File libDirectory = configuration.getLibDirectory(); - for (DriverType driverType : DriverType.values()) { - String pilotFileName = driverType.getPilotFileName(configuration); - File pilotFile = new File(libDirectory, pilotFileName); - if (!pilotFile.exists()) { - - // copy it from class-path - if (log.isInfoEnabled()) { - log.info("Copy driver " + pilotFileName + - " to directory " + libDirectory); - } - service.copyEmbeddedBinaryFile(pilotFileName, libDirectory); - } - } - } }

1 0

r854 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/persistence echobase-ui/src/main/java/fr/ifremer/echobase/ui
by tchemit＠users.forge.codelutin.com Oct. 19, 2013

Oct. 19, 2013

Author: tchemit Date: 2013-10-19 15:06:51 +0200 (Sat, 19 Oct 2013) New Revision: 854 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/854 Log: fixes #3550: Impossible de red?\195?\169ploy?\195?\169 ?\195?\160 chaud l'application Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2013-09-17 17:31:52 UTC (rev 853) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2013-10-19 13:06:51 UTC (rev 854) @@ -37,6 +37,7 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; +import java.sql.Statement; /** * helper about topia context and jdbc connections. @@ -55,6 +56,28 @@ return tx; } + public static void releaseH2RootContext(TopiaContext context) throws SQLException { + + TopiaContextImplementor rootContext = ((TopiaContextImplementor) context).getRootContext(); + + String url = (String) rootContext.getConfig().get(TopiaContextFactory.CONFIG_URL); + String login = (String) rootContext.getConfig().get(TopiaContextFactory.CONFIG_USER); + String password = (String) rootContext.getConfig().get(TopiaContextFactory.CONFIG_PASS); + + releaseRootContext(context); + + Connection conn = DriverManager.getConnection(url, login, password); + + try { + Statement statement = conn.createStatement(); + statement.execute("SHUTDOWN;"); + statement.close(); + conn.close(); + } finally { + conn.close(); + } + } + public static void releaseRootContext(TopiaContext context) { TopiaContext rootContext = ((TopiaContextImplementor) context).getRootContext(); 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 2013-09-17 17:31:52 UTC (rev 853) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java 2013-10-19 13:06:51 UTC (rev 854) @@ -48,6 +48,7 @@ import javax.servlet.ServletContext; import java.beans.Introspector; +import java.sql.SQLException; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -232,7 +233,13 @@ if (internalRootContext != null) { // release internal db - EchoBaseEntityHelper.releaseRootContext(internalRootContext); + try { + EchoBaseEntityHelper.releaseH2RootContext(internalRootContext); + } catch (SQLException e) { + if (log.isErrorEnabled()) { + log.error("Could not close internal db", e); + } + } } } finally { @@ -269,27 +276,4 @@ this.configuration = configuration; } -// protected final EventListenerList listenerList = new EventListenerList(); -// -// public void addWorkingDbChangeListener(WorkingDbChangeListener listener) { -// listenerList.add(WorkingDbChangeListener.class, listener); -// } -// -// public void removeWorkingDbChangeListener(WorkingDbChangeListener listener) { -// listenerList.remove(WorkingDbChangeListener.class, listener); -// } -// -// public void fireVoyageChangeEvent(String jdbcUrl, String voyageId) { -// VoyageChangedEvent event = new VoyageChangedEvent(jdbcUrl, voyageId); -// for (WorkingDbChangeListener listener : listenerList.getListeners(WorkingDbChangeListener.class)) { -// listener.onVoyageChanged(event); -// } -// } -// -// public void fireDbChangeEvent(String jdbcUrl) { -// DbChangedEvent event = new DbChangedEvent(jdbcUrl); -// for (WorkingDbChangeListener listener : listenerList.getListeners(WorkingDbChangeListener.class)) { -// listener.onDbChanged(event); -// } -// } }

1 0

[ANN] - EchoBase 2.2 released
by forge.codelutin.com Release Notification Sept. 17, 2013

Sept. 17, 2013

The EchoBase team is pleased to announce the echobase-2.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: http://maven-site.forge.codelutin.com/echobase Changes ------- Changes in this version include: New features: o Spatialisation des données pour la production de cartes Issue: 3037. Thanks to Tony Chemit. Resolved by tchemit. o Utiliser le favicon d'echobase pour les application embarquée Issue: 2876. Thanks to Tony Chemit. Resolved by tchemit. o Permettre l'import séparé des voyages, transits, transects Issue: 3028. Thanks to Tony Chemit. Resolved by tchemit. o Import de cartes avec paramètres non rattachés à une espèce de poissons (physique...) Issue: 3029. Thanks to Tony Chemit. Resolved by tchemit. o Pouvoir se connecter à la base de travail avec un autre utilisateur Issue: 2245. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o Paramètres manquants dans la doc d'import de données Issue: 2250. Thanks to Mathieu Doray. Resolved by tchemit. Changes: o Normalisation du nom des requètes Issue: 2875. Thanks to Tony Chemit. Resolved by tchemit. o Updates mavenpom to 4.1 Issue: 3049. Thanks to Tony Chemit. Resolved by tchemit. o Mise à jour des librairies Issue: 2870. Thanks to Tony Chemit. Resolved by tchemit. o Updates topia to 3.0-alpha-3 Issue: 3261. Thanks to Tony Chemit. Resolved by tchemit. o Updates eugene to 2.7.1 Issue: 3260. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/echobase/files * echobase-referentiel-2.2.echobase - http://forge.codelutin.com/attachments/download/1085 * echobase-ui-2.2-embedded.war - http://forge.codelutin.com/attachments/download/1086 * echobase-ui-2.2-embedded.zip - http://forge.codelutin.com/attachments/download/1087 * echobase-ui-2.2.war - http://forge.codelutin.com/attachments/download/1088 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -EchoBase team

1 0

r853 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 19:31:52 +0200 (Tue, 17 Sep 2013) New Revision: 853 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/853 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 2013-09-17 17:31:43 UTC (rev 852) +++ trunk/echobase-domain/pom.xml 2013-09-17 17:31:52 UTC (rev 853) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2013-09-17 17:31:43 UTC (rev 852) +++ trunk/echobase-services/pom.xml 2013-09-17 17:31:52 UTC (rev 853) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2013-09-17 17:31:43 UTC (rev 852) +++ trunk/echobase-tools/pom.xml 2013-09-17 17:31:52 UTC (rev 853) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2013-09-17 17:31:43 UTC (rev 852) +++ trunk/echobase-ui/pom.xml 2013-09-17 17:31:52 UTC (rev 853) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 17:31:43 UTC (rev 852) +++ trunk/pom.xml 2013-09-17 17:31:52 UTC (rev 853) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> <modules> <module>echobase-domain</module> @@ -85,12 +85,12 @@ </developers> <scm> - <url>https://forge.codelutin.com/repositories/browse/echobase/tags/echobase-2.2</url> + <url>https://forge.codelutin.com/repositories/browse/echobase/trunk</url> <connection> - scm:svn:https://forge.codelutin.com/svn/echobase/tags/echobase-2.2 + scm:svn:https://forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:https://forge.codelutin.com/svn/echobase/tags/echobase-2.2 + scm:svn:https://forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r852 - tags
by maven-release＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 19:31:43 +0200 (Tue, 17 Sep 2013) New Revision: 852 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/852 Log: [maven-release-plugin] copy for tag echobase-2.2 Added: tags/echobase-2.2/

1 0

r851 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 19:31:35 +0200 (Tue, 17 Sep 2013) New Revision: 851 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/851 Log: [maven-release-plugin] prepare release echobase-2.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 2013-09-17 17:26:10 UTC (rev 850) +++ trunk/echobase-domain/pom.xml 2013-09-17 17:31:35 UTC (rev 851) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2013-09-17 17:26:10 UTC (rev 850) +++ trunk/echobase-services/pom.xml 2013-09-17 17:31:35 UTC (rev 851) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2013-09-17 17:26:10 UTC (rev 850) +++ trunk/echobase-tools/pom.xml 2013-09-17 17:31:35 UTC (rev 851) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2013-09-17 17:26:10 UTC (rev 850) +++ trunk/echobase-ui/pom.xml 2013-09-17 17:31:35 UTC (rev 851) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 17:26:10 UTC (rev 850) +++ trunk/pom.xml 2013-09-17 17:31:35 UTC (rev 851) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <modules> <module>echobase-domain</module> @@ -85,12 +85,12 @@ </developers> <scm> - <url>https://forge.codelutin.com/repositories/browse/echobase/trunk</url> + <url>https://forge.codelutin.com/repositories/browse/echobase/tags/echobase-2.2</url> <connection> - scm:svn:https://forge.codelutin.com/svn/echobase/trunk + scm:svn:https://forge.codelutin.com/svn/echobase/tags/echobase-2.2 </connection> <developerConnection> - scm:svn:https://forge.codelutin.com/svn/echobase/trunk + scm:svn:https://forge.codelutin.com/svn/echobase/tags/echobase-2.2 </developerConnection> </scm>

1 0

r850 - trunk
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 19:26:10 +0200 (Tue, 17 Sep 2013) New Revision: 850 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/850 Log: fix scm url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 17:17:08 UTC (rev 849) +++ trunk/pom.xml 2013-09-17 17:26:10 UTC (rev 850) @@ -85,7 +85,7 @@ </developers> <scm> - <url>http://forge.codelutin.com/repositories/browse/echobase/trunk</url> + <url>https://forge.codelutin.com/repositories/browse/echobase/trunk</url> <connection> scm:svn:https://forge.codelutin.com/svn/echobase/trunk </connection>

1 0

r849 - trunk/echobase-services
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 19:17:08 +0200 (Tue, 17 Sep 2013) New Revision: 849 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/849 Log: optimize dependencies Modified: trunk/echobase-services/pom.xml Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2013-09-17 17:09:57 UTC (rev 848) +++ trunk/echobase-services/pom.xml 2013-09-17 17:17:08 UTC (rev 849) @@ -153,6 +153,11 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency>

1 0

r848 - trunk
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 19:09:57 +0200 (Tue, 17 Sep 2013) New Revision: 848 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/848 Log: fixes #3260: Updates eugene to 2.7.1 fixes #3261: Updates topia to 3.0-alpha-3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 16:37:15 UTC (rev 847) +++ trunk/pom.xml 2013-09-17 17:09:57 UTC (rev 848) @@ -139,8 +139,8 @@  - <eugenePluginVersion>2.7.1-SNAPSHOT</eugenePluginVersion> - <topiaVersion>3.0-alpha-3-SNAPSHOT</topiaVersion> + <eugenePluginVersion>2.7.1</eugenePluginVersion> + <topiaVersion>3.0-alpha-3</topiaVersion> <nuitonUtilsVersion>2.7</nuitonUtilsVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <nuitonWebVersion>1.14</nuitonWebVersion>

1 0