Author: bleny Date: 2013-05-13 18:54:10 +0200 (Mon, 13 May 2013) New Revision: 149 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: remove override of magalie.properties in web module Added: trunk/magalie-web/src/main/resources/magalie-production.properties Removed: trunk/magalie-web/src/main/resources/magalie.properties Copied: trunk/magalie-web/src/main/resources/magalie-production.properties (from rev 144, trunk/magalie-web/src/main/resources/magalie.properties) =================================================================== --- trunk/magalie-web/src/main/resources/magalie-production.properties (rev 0) +++ trunk/magalie-web/src/main/resources/magalie-production.properties 2013-05-13 16:54:10 UTC (rev 149) @@ -0,0 +1,30 @@ +### +# #%L +# MagaLiE :: UI +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2013 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.hbm2ddl.auto=validate +hibernate.show_sql=false +hibernate.format_sql=true +hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy + +magalie.devMode=false + Deleted: trunk/magalie-web/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-web/src/main/resources/magalie.properties 2013-05-13 15:58:44 UTC (rev 148) +++ trunk/magalie-web/src/main/resources/magalie.properties 2013-05-13 16:54:10 UTC (rev 149) @@ -1,22 +0,0 @@ -### -# #%L -# MagaLiE :: UI -# $Id:$ -# $HeadURL:$ -# %% -# Copyright (C) 2013 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% -###