Author: tchemit Date: 2012-04-03 10:31:01 +0200 (Tue, 03 Apr 2012) New Revision: 467 Url: http://forge.codelutin.com/repositories/revision/echobase/467 Log: fixes #1050: La cr?\195?\169ation de base embarqu?\195?\169e ne fonctionne pas Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-04-03 08:07:09 UTC (rev 466) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-04-03 08:31:01 UTC (rev 467) @@ -75,7 +75,7 @@ } finally { Closeables.closeQuietly(input); } - String dbUrl = "jdbc:h2:file:" + databaseAbsolutePath + "/echobase;CACHE_SIZE=65536;TRACE_LEVEL_FILE=3;"; + String dbUrl = "jdbc:h2:file:" + databaseAbsolutePath + "/echobase;CACHE_SIZE=65536"; properties.setProperty(TopiaContextFactory.CONFIG_URL, dbUrl); if (log.isInfoEnabled()) { @@ -103,21 +103,6 @@ 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); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-04-03 08:07:09 UTC (rev 466) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-04-03 08:31:01 UTC (rev 467) @@ -303,7 +303,7 @@ if (StringUtils.isNotEmpty(association)) { builder.append(String.format(updateString, topiaId, association)).append('\n'); compt++; - if (compt % 10000 == 0) { + if (compt % 1000 == 0) { // flush it getTransaction().executeSQL(builder.toString()); builder = new StringBuilder(); Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-03 08:07:09 UTC (rev 466) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-03 08:31:01 UTC (rev 467) @@ -396,7 +396,7 @@ background:#03497c; /*padding:20px;*/ position:relative; - /*min-width:655px;*/ + min-width:655px; min-height:415px; /*clear:both;*/ color:#FFF;