Author: sletellier Date: 2011-11-22 12:33:08 +0100 (Tue, 22 Nov 2011) New Revision: 107 Url: http://forge.codelutin.com/repositories/revision/echobase/107 Log: Move embedded configuration to embedded directory Added: trunk/echobase-services/src/main/resources/embedded/ trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties Removed: trunk/echobase-services/src/main/resources/echobase-embedded.properties 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 2011-11-22 11:32:34 UTC (rev 106) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-22 11:33:08 UTC (rev 107) @@ -114,7 +114,7 @@ log.info("Copy configuration to " + configurationfile); } InputStream configInputStream = - getClass().getResourceAsStream("/echobase-embedded.properties"); + getClass().getResourceAsStream("/embedded/echobase-embedded.properties"); OutputStream configOutputStream = new FileOutputStream(configurationfile); try { IOUtils.copy(configInputStream, configOutputStream); Deleted: trunk/echobase-services/src/main/resources/echobase-embedded.properties =================================================================== --- trunk/echobase-services/src/main/resources/echobase-embedded.properties 2011-11-22 11:32:34 UTC (rev 106) +++ trunk/echobase-services/src/main/resources/echobase-embedded.properties 2011-11-22 11:33:08 UTC (rev 107) @@ -1,29 +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% -### - -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 Copied: trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties (from rev 104, trunk/echobase-services/src/main/resources/echobase-embedded.properties) =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties (rev 0) +++ trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties 2011-11-22 11:33:08 UTC (rev 107) @@ -0,0 +1,29 @@ +### +# #%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% +### + +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 Property changes on: trunk/echobase-services/src/main/resources/embedded/echobase-embedded.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native