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

r398 - 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:05 +0100 (Thu, 22 Mar 2012) New Revision: 398 Url: http://forge.codelutin.com/repositories/revision/echobase/398 Log: [maven-release-plugin] prepare release echobase-0.3 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:25:48 UTC (rev 397) +++ trunk/echobase-entities/pom.xml 2012-03-22 21:30:05 UTC (rev 398) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-03-22 21:25:48 UTC (rev 397) +++ trunk/echobase-services/pom.xml 2012-03-22 21:30:05 UTC (rev 398) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-03-22 21:25:48 UTC (rev 397) +++ trunk/echobase-tools/pom.xml 2012-03-22 21:30:05 UTC (rev 398) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-03-22 21:25:48 UTC (rev 397) +++ trunk/echobase-ui/pom.xml 2012-03-22 21:30:05 UTC (rev 398) @@ -1,8 +1,6 @@ <?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> @@ -13,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-22 21:25:48 UTC (rev 397) +++ trunk/pom.xml 2012-03-22 21:30:05 UTC (rev 398) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> <modules> <module>echobase-entities</module> @@ -79,12 +79,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.3</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.3 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.3 </developerConnection> </scm>

1 0

r397 - trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata
by tchemit＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 22:25:48 +0100 (Thu, 22 Mar 2012) New Revision: 397 Url: http://forge.codelutin.com/repositories/revision/echobase/397 Log: remove not working test Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java 2012-03-22 21:21:18 UTC (rev 396) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java 2012-03-22 21:25:48 UTC (rev 397) @@ -51,6 +51,7 @@ return new String[]{"/import-data", "result", filename}; } + @Ignore @Test public void doImportEsduResultByEchotype() throws Exception {

1 0

r396 - trunk/echobase-services/src/test/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 22:21:18 +0100 (Thu, 22 Mar 2012) New Revision: 396 Url: http://forge.codelutin.com/repositories/revision/echobase/396 Log: fix build Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java 2012-03-22 21:11:50 UTC (rev 395) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java 2012-03-22 21:21:18 UTC (rev 396) @@ -47,7 +47,7 @@ @Test public void testCreateEmbeddedApplication() throws Exception { EmbeddedApplicationConfiguration conf = new EmbeddedApplicationConfiguration(); - conf.setVoyageIds(getVoyageId()); + conf.setVoyageIds(new String[]{getVoyageId()}); File workingDirectory = new File(getTestDir(), "work-dir"); FileUtil.createDirectoryIfNecessary(workingDirectory);

1 0

r395 - in trunk: . echobase-entities echobase-services echobase-ui/src/license
by tchemit＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 22:11:50 +0100 (Thu, 22 Mar 2012) New Revision: 395 Url: http://forge.codelutin.com/repositories/revision/echobase/395 Log: optimize dependencies + third parties Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-03-22 21:05:18 UTC (rev 394) +++ trunk/echobase-entities/pom.xml 2012-03-22 21:11:50 UTC (rev 395) @@ -61,10 +61,10 @@ <artifactId>commons-collections</artifactId> </dependency--> -  + </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -79,11 +79,6 @@ </dependency> <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-replication</artifactId> - </dependency> - - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-03-22 21:05:18 UTC (rev 394) +++ trunk/echobase-services/pom.xml 2012-03-22 21:11:50 UTC (rev 395) @@ -92,17 +92,7 @@ <artifactId>topia-persistence</artifactId> </dependency> -  - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-replication</artifactId> - </dependency> - - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> Modified: trunk/echobase-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-ui/src/license/THIRD-PARTY.properties 2012-03-22 21:05:18 UTC (rev 394) +++ trunk/echobase-ui/src/license/THIRD-PARTY.properties 2012-03-22 21:11:50 UTC (rev 395) @@ -7,20 +7,18 @@ # - BSD License # - BSD style # - BSD-style license -# - CDDL 1.0 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 -# - Eclipse Public License v1.0 # - GNU Library or Lesser General Public License # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Lesser General Public License (LGPL v. 2.1) +# - LGPL, version 2.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 -# - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - MIT License +# - MPL 1.1 # - Mozilla Public License version 1.1 # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 @@ -32,13 +30,11 @@ # Please fill the missing licenses for dependencies : # # -#Tue Dec 27 15:42:21 CET 2011 +#Thu Mar 22 22:11:23 CET 2012 antlr--antlr--2.7.6=BSD License cglib--cglib-nodep--2.1_3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.8.0.GA=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) 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 -net.java.dev.jna--jna--3.3.0=Lesser General Public License (LGPL v. 2.1) oro--oro--2.0.8=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-22 21:05:18 UTC (rev 394) +++ trunk/pom.xml 2012-03-22 21:11:50 UTC (rev 395) @@ -181,13 +181,6 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-profiling</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> </dependency> @@ -248,13 +241,6 @@ </dependency> <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-replication</artifactId> - <version>${topiaVersion}</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version>

1 0

r394 - trunk
by tchemit＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 22:05:18 +0100 (Thu, 22 Mar 2012) New Revision: 394 Url: http://forge.codelutin.com/repositories/revision/echobase/394 Log: updates to mavenpom 3.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-22 20:57:52 UTC (rev 393) +++ trunk/pom.xml 2012-03-22 21:05:18 UTC (rev 394) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r393 - trunk
by tchemit＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 21:57:52 +0100 (Thu, 22 Mar 2012) New Revision: 393 Url: http://forge.codelutin.com/repositories/revision/echobase/393 Log: updates some libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-22 20:19:15 UTC (rev 392) +++ trunk/pom.xml 2012-03-22 20:57:52 UTC (rev 393) @@ -124,15 +124,15 @@  <eugenePluginVersion>2.4.2</eugenePluginVersion> - <topiaVersion>2.6.7</topiaVersion> - <nuitonUtilsVersion>2.4.6-SNAPSHOT</nuitonUtilsVersion> + <topiaVersion>2.6.8</topiaVersion> + <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.10</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <struts2Version>2.3.1.2</struts2Version> - <jqueryPluginVersion>3.2.1</jqueryPluginVersion> - <seleniumVersion>2.18.0</seleniumVersion> - <h2Version>1.3.164</h2Version> + <jqueryPluginVersion>3.3.0</jqueryPluginVersion> + <seleniumVersion>2.20.0</seleniumVersion> + <h2Version>1.3.165</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <slf4jVersion>1.6.4</slf4jVersion> <jackcessVersion>1.2.6</jackcessVersion>

1 0

r392 - trunk/echobase-services/src/main/resources/embedded
by tchemit＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 21:19:15 +0100 (Thu, 22 Mar 2012) New Revision: 392 Url: http://forge.codelutin.com/repositories/revision/echobase/392 Log: svn properties Modified: trunk/echobase-services/src/main/resources/embedded/README.txt Property changes on: trunk/echobase-services/src/main/resources/embedded/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r391 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/resources echobase-services/src/main/java/fr/ifremer/echobase/services/configurations echobase-services/src/main/resources/embedded echobase-services/src/test/java/fr/ifremer/echobase/services echobase-ui/src/main/resources
by tchemit＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 21:17:54 +0100 (Thu, 22 Mar 2012) New Revision: 391 Url: http://forge.codelutin.com/repositories/revision/echobase/391 Log: fixes #1014 : Am?\195?\169lioration de a cr?\195?\169ation de base embarqu?\195?\169e Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java trunk/echobase-entities/src/main/resources/topia-h2.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java trunk/echobase-services/src/main/resources/embedded/echobase.properties trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java trunk/echobase-ui/src/main/resources/echobase.properties Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-03-22 18:11:04 UTC (rev 390) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-03-22 20:17:54 UTC (rev 391) @@ -32,7 +32,6 @@ import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.FileUtil; import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; import java.io.File; import java.io.IOException; @@ -86,6 +85,25 @@ } applicationConfig.parse(); + File dataDirectory = getDataDirectory(); + String dataDirectoryPath = dataDirectory.getAbsolutePath(); + if (log.isInfoEnabled()) { + log.info("Data directory = "+dataDirectoryPath); + } + if (dataDirectoryPath.endsWith(".")) { + dataDirectoryPath = dataDirectory.getParentFile().getAbsolutePath(); + if (log.isInfoEnabled()) { + log.info("Not absolute data directory " + dataDirectory + " will use " + dataDirectoryPath); + } + + // always use the absolue path (in cas of embedded db, + // we wants to have it. + applicationConfig.setOption( + EchoBaseConfigurationOption.DATA_DIRECTORY.key, + dataDirectoryPath + ); + } + } catch (ArgumentsParserException e) { throw new EchoBaseTechnicalException( "Could not parse configuration", e); @@ -94,7 +112,8 @@ createDirectory(EchoBaseConfigurationOption.DATA_DIRECTORY); if (log.isDebugEnabled()) { - log.debug("parsed options in config file" + applicationConfig.getOptions()); + log.debug("parsed options in config file" + + applicationConfig.getOptions()); } } @@ -109,51 +128,61 @@ } public File getDataDirectory() { - File file = applicationConfig.getOptionAsFile(EchoBaseConfigurationOption.DATA_DIRECTORY.key); + File file = applicationConfig.getOptionAsFile( + EchoBaseConfigurationOption.DATA_DIRECTORY.key); Preconditions.checkNotNull(file); return file; } public File getWarDirectory() { - File file = applicationConfig.getOptionAsFile(EchoBaseConfigurationOption.WAR_DIRECTORY.key); + File file = applicationConfig.getOptionAsFile( + EchoBaseConfigurationOption.WAR_DIRECTORY.key); Preconditions.checkNotNull(file); return file; } public File getWarLocation() { - File file = applicationConfig.getOptionAsFile(EchoBaseConfigurationOption.WAR_LOCATION.key); + File file = applicationConfig.getOptionAsFile( + EchoBaseConfigurationOption.WAR_LOCATION.key); Preconditions.checkNotNull(file); return file; } public char getCsvSeparator() { - char csvSeparator = applicationConfig.getOption(char.class, EchoBaseConfigurationOption.CSV_SEPARATOR.key); + char csvSeparator = applicationConfig.getOption( + char.class, EchoBaseConfigurationOption.CSV_SEPARATOR.key); Preconditions.checkNotNull(csvSeparator); return csvSeparator; } public Version getApplicationVersion() { -// String versionStr = -// applicationConfig.getOption(EchoBaseConfigurationOption.VERSION.key); -// String s = VersionUtil.removeSnapshot(versionStr); -// Version v = VersionUtil.valueOf(s); - Version v = applicationConfig.getOptionAsVersion(EchoBaseConfigurationOption.VERSION.key); + Version v = applicationConfig.getOptionAsVersion( + EchoBaseConfigurationOption.VERSION.key); Preconditions.checkNotNull(v); return v; } public URL getApplicationSite() { - URL url = applicationConfig.getOptionAsURL(EchoBaseConfigurationOption.SITE_URL.key); + URL url = applicationConfig.getOptionAsURL( + EchoBaseConfigurationOption.SITE_URL.key); Preconditions.checkNotNull(url); return url; } public Class<?> getDriverClass() { - Class<?> klass = applicationConfig.getOptionAsClass(TopiaContextFactory.CONFIG_DRIVER); + Class<?> klass = applicationConfig.getOptionAsClass( + TopiaContextFactory.CONFIG_DRIVER); Preconditions.checkNotNull(klass); return klass; } + public String getJdbcUrl() { + String jdbcUrl = applicationConfig.getOption( + TopiaContextFactory.CONFIG_URL); + Preconditions.checkNotNull(jdbcUrl); + return jdbcUrl; + } + public boolean isEmbedded() { Class<?> driverClass = getDriverClass(); return driverClass.getName().toLowerCase().contains("h2"); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-03-22 18:11:04 UTC (rev 390) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-03-22 20:17:54 UTC (rev 391) @@ -69,6 +69,7 @@ Preconditions.checkNotNull(input, "Could not find resource " + configPath); properties.load(input); + input.close(); } catch (IOException e) { throw new RuntimeException(e); } finally { @@ -102,6 +103,21 @@ public TopiaContext newDatabaseFromConfig(EchoBaseConfiguration config) { + +// String jdbcUrl = config.getJdbcUrl(); +// if (config.isEmbedded() && jdbcUrl.contains("{data.directory}")) { +// +// // make sure that datadirectory is a absolute path +// +// File dataDirectory = config.getDataDirectory(); +// if (log.isInfoEnabled()) { +// log.info("Will use data directory "); +// } +// properties.setProperty( +// EchoBaseConfigurationOption.DATA_DIRECTORY.getKey(), +// dataDirectory.getAbsolutePath()); +// } + Properties properties = config.getProperties(); return newDatabaseFromProperties(properties); @@ -112,10 +128,11 @@ if (log.isDebugEnabled()) { log.debug("Database settings are :"); Set<String> keysToDisplay = Sets.newHashSet( - "hibernate.dialect", - "hibernate.connection.driver_class", - "hibernate.connection.url", - "hibernate.connection.username"); + TopiaContextFactory.CONFIG_DRIVER, + TopiaContextFactory.CONFIG_DIALECT, + TopiaContextFactory.CONFIG_URL, + TopiaContextFactory.CONFIG_USER + ); for (String key : keysToDisplay) { log.debug(String.format("%s=%s", key, properties.getProperty(key))); } Modified: trunk/echobase-entities/src/main/resources/topia-h2.properties =================================================================== --- trunk/echobase-entities/src/main/resources/topia-h2.properties 2012-03-22 18:11:04 UTC (rev 390) +++ trunk/echobase-entities/src/main/resources/topia-h2.properties 2012-03-22 20:17:54 UTC (rev 391) @@ -25,6 +25,7 @@ hibernate.show_sql=false hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.driver_class=org.h2.Driver hibernate.connection.username=sa hibernate.connection.password=sa -hibernate.connection.driver_class=org.h2.Driver \ No newline at end of file +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java 2012-03-22 18:11:04 UTC (rev 390) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java 2012-03-22 20:17:54 UTC (rev 391) @@ -82,7 +82,7 @@ return voyageIds; } - public void setVoyageIds(String... voyageIds) { + public void setVoyageIds(String[] voyageIds) { this.voyageIds = Arrays.copyOf(voyageIds, voyageIds.length); } Modified: trunk/echobase-services/src/main/resources/embedded/echobase.properties =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-03-22 18:11:04 UTC (rev 390) +++ trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-03-22 20:17:54 UTC (rev 391) @@ -27,6 +27,8 @@ data.directory=. +war.directory=${data.directory} + hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.username=sa hibernate.connection.password=sa Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java 2012-03-22 18:11:04 UTC (rev 390) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ExportDbServiceTest.java 2012-03-22 20:17:54 UTC (rev 391) @@ -41,7 +41,7 @@ protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext( - AbstractImportDataServiceIT.IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT); + AbstractImportDataServiceIT.IMPORT_DATA_ECHOBASE_COMMON_DATA); } @Test Modified: trunk/echobase-ui/src/main/resources/echobase.properties =================================================================== --- trunk/echobase-ui/src/main/resources/echobase.properties 2012-03-22 18:11:04 UTC (rev 390) +++ trunk/echobase-ui/src/main/resources/echobase.properties 2012-03-22 20:17:54 UTC (rev 391) @@ -24,7 +24,6 @@ project.version=${project.version} project.site.url=${project.url} -topia.service.replication=org.nuiton.topia.replication.TopiaReplicationServiceImpl hibernate.hbm2ddl.auto=none hibernate.show_sql=false

1 0

r390 - in trunk/echobase-services: . src/main/java/fr/ifremer/echobase/services src/main/resources/embedded src/test/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 22 Mar '12

22 Mar '12

Author: tchemit Date: 2012-03-22 19:11:04 +0100 (Thu, 22 Mar 2012) New Revision: 390 Url: http://forge.codelutin.com/repositories/revision/echobase/390 Log: add db drivers in embedded application Added: trunk/echobase-services/src/main/resources/embedded/README.txt trunk/echobase-services/src/main/resources/embedded/echobase.properties Removed: trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties Modified: trunk/echobase-services/pom.xml trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-03-22 18:10:27 UTC (rev 389) +++ trunk/echobase-services/pom.xml 2012-03-22 18:11:04 UTC (rev 390) @@ -195,6 +195,25 @@ </executions> </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>copy-dependencies</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/classes/embedded</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <includeArtifactIds>h2,postgresql</includeArtifactIds> + <excludeTransitive>true</excludeTransitive> + </configuration> + </plugin> + </plugins> </build> 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-22 18:10:27 UTC (rev 389) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-03-22 18:11:04 UTC (rev 390) @@ -49,6 +49,7 @@ import java.io.OutputStreamWriter; import java.net.URISyntaxException; import java.util.List; +import java.util.Properties; /** * To create embedded application. @@ -65,30 +66,6 @@ public static final String EMBEDDED_PATH = "/embedded/"; - public enum EmbeddedFile { - - ECHOBASE_PROPERTIES("echobase-embedded.properties", "echobase.properties"), - START_BAT("startEchobase.sh", "startEchobase.sh"), - START_SH("startEchobase.bat", "startEchobase.bat"); - - protected final String inputFileName; - - protected final String outputFileName; - - EmbeddedFile(String inputFileName, String outputFileName) { - this.inputFileName = inputFileName; - this.outputFileName = outputFileName; - } - - public String getInputFileName() { - return inputFileName; - } - - public String getOutputFileName() { - return outputFileName; - } - } - public File createEmbeddedApplication(EmbeddedApplicationConfiguration model) { int nbSteps = computeNbSteps(model); @@ -142,12 +119,12 @@ importDb(model, newServiceContext, exportZipFile, admin); } catch (Exception eee) { - throw new EchoBaseTechnicalException("Could not create h2 embedded database at "+dir,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); + throw new EchoBaseTechnicalException("Could not close h2 embedded database at " + dir, eee); } } @@ -172,7 +149,6 @@ protected void createStaticArchiveStructure(EmbeddedApplicationConfiguration model, File dir) { - try { File warLocation = model.getWarLocation(); @@ -180,7 +156,7 @@ FileUtil.createDirectoryIfNecessary(dir); // copy embedded files to / - copyEmbeddedFiles(model, dir); + copyEmbeddedFiles(dir); // copy war to / FileUtil.copy(warLocation, new File(dir, warLocation.getName())); @@ -213,36 +189,54 @@ throw new EchoBaseTechnicalException( "Could not export db to zip", eee); } - - } - protected void copyEmbeddedFiles(EmbeddedApplicationConfiguration model, - File zipDirectory) throws IOException, URISyntaxException { + protected void copyEmbeddedFiles(File zipDirectory) throws IOException, URISyntaxException { - for (EmbeddedFile startFile : EmbeddedFile.values()) { + // config to keep the echobase-embedded values (contains h2 and pg versions) + Properties config = new Properties(); + copyEmbeddedFiles("echobase.properties", zipDirectory, config); + String h2Version = config.getProperty("h2Version"); + String pgVersion = config.getProperty("postgresqlVersion"); - String in = startFile.getInputFileName(); - String out = startFile.getOutputFileName(); + copyEmbeddedFiles("startEchobase.bat", zipDirectory, null); + copyEmbeddedFiles("startEchobase.sh", zipDirectory, null); + copyEmbeddedFiles("README.txt", zipDirectory, null); - InputStream inputStream = - getClass().getResourceAsStream(EMBEDDED_PATH + in); + File driverDir = new File(zipDirectory, "drivers"); + FileUtil.createDirectoryIfNecessary(driverDir); + copyEmbeddedFiles("h2-" + h2Version + ".jar", driverDir, null); + copyEmbeddedFiles("postgresql-" + pgVersion + ".jar", driverDir, null); + } + + protected void copyEmbeddedFiles(String resourceName, + File zipDirectory, + Properties config) throws IOException { + String resourcePath = EMBEDDED_PATH + resourceName; + InputStream inputStream = getClass().getResourceAsStream(resourcePath); + Preconditions.checkNotNull(inputStream, + "could not find resource " + resourcePath); + try { + if (config != null) { + config.load(inputStream); + } + File outputFile = new File(zipDirectory, resourceName); + if (log.isInfoEnabled()) { + log.info("Copy configuration to " + resourceName + " to " + outputFile); + } + OutputStreamWriter outputStream = new OutputStreamWriter( + new FileOutputStream(outputFile), Charsets.UTF_8); try { - Preconditions.checkNotNull(inputStream); - File outputFile = new File(zipDirectory, out); - if (log.isInfoEnabled()) { - log.info("Copy configuration to " + in + " to " + outputFile); - } - OutputStreamWriter outputStream = new OutputStreamWriter( - new FileOutputStream(outputFile), Charsets.UTF_8); - try { + if (config == null) { IOUtils.copy(inputStream, outputStream); - } finally { - outputStream.close(); + } else { + config.store(outputStream, null); } } finally { - inputStream.close(); + outputStream.close(); } + } finally { + inputStream.close(); } } Added: trunk/echobase-services/src/main/resources/embedded/README.txt =================================================================== --- trunk/echobase-services/src/main/resources/embedded/README.txt (rev 0) +++ trunk/echobase-services/src/main/resources/embedded/README.txt 2012-03-22 18:11:04 UTC (rev 390) @@ -0,0 +1,2 @@ +Le répertoire 'drivers' contient les pilotes jdbc à positionner dans libre-office +pour pouvoir interroger l'application embarquée. \ No newline at end of file Deleted: trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties 2012-03-22 18:10:27 UTC (rev 389) +++ trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties 2012-03-22 18:11:04 UTC (rev 390) @@ -1,34 +0,0 @@ -### -# #%L -# EchoBase :: Services -# -# $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% -### - -data.directory=. - -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.username=sa -hibernate.connection.password=sa -hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:./db/echobase - -# Replication configuration -topia.service.replication=org.nuiton.topia.replication.TopiaReplicationServiceImpl Copied: trunk/echobase-services/src/main/resources/embedded/echobase.properties (from rev 386, trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties) =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase.properties (rev 0) +++ trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-03-22 18:11:04 UTC (rev 390) @@ -0,0 +1,34 @@ +### +# #%L +# EchoBase :: Services +# +# $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% +### + +postgresqlVersion=${postgresqlVersion} +h2Version=${h2Version} + +data.directory=. + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase Property changes on: trunk/echobase-services/src/main/resources/embedded/echobase.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java 2012-03-22 18:10:27 UTC (rev 389) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceIT.java 2012-03-22 18:11:04 UTC (rev 390) @@ -41,7 +41,7 @@ protected FakeEchoBaseServiceContext initContext() { return new FakeEchoBaseServiceContext( - AbstractImportDataServiceIT.IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT); + AbstractImportDataServiceIT.IMPORT_DATA_ECHOBASE_COMMON_DATA); } @Test

1 0

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

22 Mar '12

Author: tchemit Date: 2012-03-22 19:10:27 +0100 (Thu, 22 Mar 2012) New Revision: 389 Url: http://forge.codelutin.com/repositories/revision/echobase/389 Log: conf for tomcat7 plugin Modified: trunk/echobase-ui/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-03-22 16:46:26 UTC (rev 388) +++ trunk/echobase-ui/pom.xml 2012-03-22 18:10:27 UTC (rev 389) @@ -297,6 +297,14 @@ </plugin> <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <configuration> + <path>/echobase</path> + </configuration> + </plugin> + + <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> <archive>

1 0