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

r408 - trunk/echobase-services
by tchemit＠users.forge.codelutin.com 26 Mar '12

26 Mar '12

Author: tchemit Date: 2012-03-27 01:02:10 +0200 (Tue, 27 Mar 2012) New Revision: 408 Url: http://forge.codelutin.com/repositories/revision/echobase/408 Log: add more memory for tests Modified: trunk/echobase-services/pom.xml Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-03-26 23:01:33 UTC (rev 407) +++ trunk/echobase-services/pom.xml 2012-03-26 23:02:10 UTC (rev 408) @@ -24,13 +24,6 @@ <version>${project.version}</version> </dependency> -  -  <dependency> @@ -170,6 +163,17 @@ </resource> </resources> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Xms512m -Xmx1512m</argLine> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin>

1 0

r407 - trunk
by tchemit＠users.forge.codelutin.com 26 Mar '12

26 Mar '12

Author: tchemit Date: 2012-03-27 01:01:33 +0200 (Tue, 27 Mar 2012) New Revision: 407 Url: http://forge.codelutin.com/repositories/revision/echobase/407 Log: use snapshot of mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-26 14:28:09 UTC (rev 406) +++ trunk/pom.xml 2012-03-26 23:01:33 UTC (rev 407) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2</version> + <version>3.2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -143,8 +143,6 @@ <googleSearchEnabled>true</googleSearchEnabled> - <jettyPluginVersion>8.1.2.v20120308</jettyPluginVersion> -  <license.organizationName> Ifremer, Codelutin

1 0

r406 - trunk
by tchemit＠users.forge.codelutin.com 26 Mar '12

26 Mar '12

Author: tchemit Date: 2012-03-26 16:28:09 +0200 (Mon, 26 Mar 2012) New Revision: 406 Url: http://forge.codelutin.com/repositories/revision/echobase/406 Log: update deps Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-23 10:42:44 UTC (rev 405) +++ trunk/pom.xml 2012-03-26 14:28:09 UTC (rev 406) @@ -143,6 +143,8 @@ <googleSearchEnabled>true</googleSearchEnabled> + <jettyPluginVersion>8.1.2.v20120308</jettyPluginVersion> +  <license.organizationName> Ifremer, Codelutin @@ -307,12 +309,6 @@ </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>11.0.1</version> - </dependency> - - <dependency> <groupId>net.sourceforge.javacsv</groupId> <artifactId>javacsv</artifactId> <version>2.0</version>

1 0

r405 - trunk/echobase-entities/src/main/xmi
by tchemit＠users.forge.codelutin.com 23 Mar '12

23 Mar '12

Author: tchemit Date: 2012-03-23 11:42:44 +0100 (Fri, 23 Mar 2012) New Revision: 405 Url: http://forge.codelutin.com/repositories/revision/echobase/405 Log: fixes #1018 Modified: trunk/echobase-entities/src/main/xmi/echobase.properties Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-03-23 10:35:17 UTC (rev 404) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-03-23 10:42:44 UTC (rev 405) @@ -40,6 +40,9 @@ fr.ifremer.echobase.entities.data.Transect.attribute.operation.stereotype=ordered fr.ifremer.echobase.entities.data.Transect.attribute.operation.tagvalue.orderBy=gearShootingStartTime +#unique +fr.ifremer.echobase.entities.data.Voyage.attribute.echotype.stereotype=unique + # big text zone fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagvalue.type=text fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagvalue.type=text

1 0

r404 - trunk/echobase-ui
by tchemit＠users.forge.codelutin.com 23 Mar '12

23 Mar '12

Author: tchemit Date: 2012-03-23 11:35:17 +0100 (Fri, 23 Mar 2012) New Revision: 404 Url: http://forge.codelutin.com/repositories/revision/echobase/404 Log: add tomcat?\195?\168 plugin Modified: trunk/echobase-ui/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-03-23 10:34:52 UTC (rev 403) +++ trunk/echobase-ui/pom.xml 2012-03-23 10:35:17 UTC (rev 404) @@ -328,6 +328,20 @@ </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jspc-maven-plugin</artifactId> + <version>1.4.6</version> + <executions> + <execution> + <id>jspc</id> + <goals> + <goal>compile</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> </build>

1 0

r403 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 23 Mar '12

23 Mar '12

Author: tchemit Date: 2012-03-23 11:34:52 +0100 (Fri, 23 Mar 2012) New Revision: 403 Url: http://forge.codelutin.com/repositories/revision/echobase/403 Log: improve create embedded application memory footprint Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-03-23 10:34:10 UTC (rev 402) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-03-23 10:34:52 UTC (rev 403) @@ -121,17 +121,29 @@ } catch (Exception eee) { throw new EchoBaseTechnicalException("Could not create h2 embedded database at " + dir, eee); } finally { - try { - rootContext.closeContext(); - } catch (TopiaException eee) { - throw new EchoBaseTechnicalException("Could not close h2 embedded database at " + dir, eee); - } + closeContext(rootContext, "Could not close h2 embedded database at " + dir); } EchoBaseIOUtil.compressZipFile(zipFile, dir); return zipFile; } + protected void closeContext(TopiaContext tx, String message) { + try { + tx.closeContext(); + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException(message, eee); + } + } + + protected TopiaContext beginTransaction(TopiaContext tx, String message) { + try { + return tx.beginTransaction(); + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException(message, eee); + } + } + protected int computeNbSteps(EmbeddedApplicationConfiguration model) { int nbSteps = 4; @@ -176,10 +188,20 @@ File exportTempDir = new File(tempDirectory, "exportDb"); exportconfiguration.setWorkingDirectory(exportTempDir); exportconfiguration.setVoyageIds(model.getVoyageIds()); + TopiaContext transaction = serviceContext.getTransaction(); - ExportDbService exportDbService = - serviceContext.newService(ExportDbService.class); - exportDbService.exportPartialDb(exportconfiguration, false); + TopiaContext newTx = beginTransaction( + transaction, + "Could not begin transaction on main db"); + try { + serviceContext.setTransaction(newTx); + ExportDbService exportDbService = + serviceContext.newService(ExportDbService.class); + exportDbService.exportPartialDb(exportconfiguration, false); + } finally { + serviceContext.setTransaction(transaction); + closeContext(newTx, "Could not close transaction on main db"); + } File exportZipFile = exportconfiguration.getExportFile(); if (log.isInfoEnabled()) { log.info("Export zip file = " + exportZipFile);

1 0

r402 - in trunk: echobase-services/src/main/resources/embedded echobase-services/src/test/resources echobase-ui/src/main/env/prod/resources
by tchemit＠users.forge.codelutin.com 23 Mar '12

23 Mar '12

Author: tchemit Date: 2012-03-23 11:34:10 +0100 (Fri, 23 Mar 2012) New Revision: 402 Url: http://forge.codelutin.com/repositories/revision/echobase/402 Log: fixes 1017 Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.bat trunk/echobase-services/src/main/resources/embedded/startEchobase.sh trunk/echobase-services/src/test/resources/log4j.properties trunk/echobase-ui/src/main/env/prod/resources/log4j.xml Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.bat =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2012-03-23 10:33:08 UTC (rev 401) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.bat 2012-03-23 10:34:10 UTC (rev 402) @@ -1 +1,2 @@ -java -jar echobase-ui-${project.version}.war \ No newline at end of file +ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=./logs" +java %ECHOBASE_OPTS% -jar echobase-ui-${project.version}.war \ No newline at end of file Modified: trunk/echobase-services/src/main/resources/embedded/startEchobase.sh =================================================================== --- trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-03-23 10:33:08 UTC (rev 401) +++ trunk/echobase-services/src/main/resources/embedded/startEchobase.sh 2012-03-23 10:34:10 UTC (rev 402) @@ -1,11 +1,8 @@ #!/bin/sh -MX=512M +OLDPWD=`pwd` cd `dirname $0` -if [ -n "$JAVA_HOME" ]; then - $JAVA_HOME/bin/java -Xmx$MX -Xms$MX -jar echobase-ui-${project.version}.war $* -else - java -Xmx$MX -Xms$MX -jar echobase-ui-${project.version}.war $* -fi +CURRENTPWD=`pwd` +ECHOBASE_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dechobase.log.dir=$CURRENTPWD/logs" +java $ECHOBASE_OPTS -jar echobase-ui-0.4-SNAPSHOT.war $* cd "$OLDPWD" - Modified: trunk/echobase-services/src/test/resources/log4j.properties =================================================================== --- trunk/echobase-services/src/test/resources/log4j.properties 2012-03-23 10:33:08 UTC (rev 401) +++ trunk/echobase-services/src/test/resources/log4j.properties 2012-03-23 10:34:10 UTC (rev 402) @@ -31,4 +31,4 @@ # package level log4j.logger.fr.ifremer.echobase=INFO #log4j.logger.fr.ifremer.echobase.services.ReplicateEntityVisitor=DEBUG -log4j.logger.fr.ifremer.echobase.services.importdata.AcousticDataImportService=DEBUG +#log4j.logger.fr.ifremer.echobase.services.importdata.AcousticDataImportService=DEBUG Modified: trunk/echobase-ui/src/main/env/prod/resources/log4j.xml =================================================================== --- trunk/echobase-ui/src/main/env/prod/resources/log4j.xml 2012-03-23 10:33:08 UTC (rev 401) +++ trunk/echobase-ui/src/main/env/prod/resources/log4j.xml 2012-03-23 10:34:10 UTC (rev 402) @@ -44,20 +44,7 @@ </layout> </appender> -  -  -  - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c] %m%n"/> - </layout> - </appender> - - <logger name="org.nuiton"> + <logger name="org"> <level value="WARN"/> </logger> @@ -68,7 +55,6 @@ <root> <priority value="ERROR"/> <appender-ref ref="FILE"/> - <appender-ref ref="CONSOLE"/> </root> </log4j:configuration>

1 0

r401 - trunk
by tchemit＠users.forge.codelutin.com 23 Mar '12

23 Mar '12

Author: tchemit Date: 2012-03-23 11:33:08 +0100 (Fri, 23 Mar 2012) New Revision: 401 Url: http://forge.codelutin.com/repositories/revision/echobase/401 Log: add tomcat?\195?\168 plugin Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-22 21:30:19 UTC (rev 400) +++ trunk/pom.xml 2012-03-23 10:33:08 UTC (rev 401) @@ -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> @@ -425,6 +427,12 @@ <version>${nuitonI18nVersion}</version> </plugin> + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <version>2.0-beta-1</version> + </plugin> + </plugins> </pluginManagement>

1 0

r400 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: maven-release Date: 2012-03-22 22:30:19 +0100 (Thu, 22 Mar 2012) New Revision: 400 Url: http://forge.codelutin.com/repositories/revision/echobase/400 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-03-22 21:30:12 UTC (rev 399) +++ trunk/echobase-entities/pom.xml 2012-03-22 21:30:19 UTC (rev 400) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-03-22 21:30:12 UTC (rev 399) +++ trunk/echobase-services/pom.xml 2012-03-22 21:30:19 UTC (rev 400) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-03-22 21:30:12 UTC (rev 399) +++ trunk/echobase-tools/pom.xml 2012-03-22 21:30:19 UTC (rev 400) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-03-22 21:30:12 UTC (rev 399) +++ trunk/echobase-ui/pom.xml 2012-03-22 21:30:19 UTC (rev 400) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-22 21:30:12 UTC (rev 399) +++ trunk/pom.xml 2012-03-22 21:30:19 UTC (rev 400) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.3</version> + <version>0.4-SNAPSHOT</version> <modules> <module>echobase-entities</module> @@ -79,12 +79,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.3</url> + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.3 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.3 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r399 - tags
by maven-release＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: maven-release Date: 2012-03-22 22:30:12 +0100 (Thu, 22 Mar 2012) New Revision: 399 Url: http://forge.codelutin.com/repositories/revision/echobase/399 Log: [maven-release-plugin] copy for tag echobase-0.3 Added: tags/echobase-0.3/

1 0