Author: sbavencoff Date: 2014-07-04 09:14:57 +0200 (Fri, 04 Jul 2014) New Revision: 1035 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1035 Log: refs #4194 : fix dependencies and lizmpa repository id Modified: trunk/echobase-services/pom.xml trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java trunk/echobase-ui/pom.xml trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2014-07-03 14:56:06 UTC (rev 1034) +++ trunk/echobase-services/pom.xml 2014-07-04 07:14:57 UTC (rev 1035) @@ -223,12 +223,6 @@ <scope>test</scope> </dependency> - <!-- base sqlite for Lizmap --> - <dependency> - <groupId>org.xerial</groupId> - <artifactId>sqlite-jdbc</artifactId> - </dependency> - </dependencies> <profiles> Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-07-03 14:56:06 UTC (rev 1034) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-07-04 07:14:57 UTC (rev 1035) @@ -264,7 +264,7 @@ String repository = host + port + dbname; - repository = StringUtils.replaceEach(repository, new String[]{"-"}, new String[]{""}); + repository = StringUtils.replaceEach(repository, new String[]{"-", "."}, new String[]{"", ""}); return repository; } Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2014-07-03 14:56:06 UTC (rev 1034) +++ trunk/echobase-ui/pom.xml 2014-07-04 07:14:57 UTC (rev 1035) @@ -264,6 +264,13 @@ <scope>runtime</scope> </dependency> + + <dependency> + <groupId>org.xerial</groupId> + <artifactId>sqlite-jdbc</artifactId> + <scope>runtime</scope> + </dependency> + <!-- commons dependencies --> <dependency> 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 2014-07-03 14:56:06 UTC (rev 1034) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2014-07-04 07:14:57 UTC (rev 1035) @@ -48,7 +48,6 @@ static { try { Class.forName("org.postgresql.Driver"); - Class.forName("org.sqlite.JDBC"); } catch (ClassNotFoundException e) { if (log.isErrorEnabled()) { log.error("Could not find pg driver", e); @@ -61,6 +60,14 @@ log.error("Could not find h2 driver", e); } } + try { + Class.forName("org.sqlite.JDBC"); + } catch (ClassNotFoundException e) { + if (log.isErrorEnabled()) { + log.error("Could not find sqlite driver", e); + } + } + } @Override