Author: julien_viet Date: 2010-01-23 16:57:26 -0500 (Sat, 23 Jan 2010) New Revision: 1434 Added: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties Removed: portal/trunk/component/common/src/main/java/conf/configuration.properties Modified: portal/trunk/component/common/src/main/java/conf/configuration.xml Log: actually rename configuration.properties to tomcat-configuration.properties Copied: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties (from rev 1433, portal/trunk/component/common/src/main/java/conf/configuration.properties) =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties (rev 0) +++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-01-23 21:57:26 UTC (rev 1434) @@ -0,0 +1,32 @@ +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + +# Datasource name +gatein.datasource.name=jdbcexo + +# Data +gatein.data.dir=../temp + +# DB +gatein.db.data.dir=${gatein.data.dir}/db + +# JCR +gatein.jcr.data.dir=${gatein.data.dir}/jcr +gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values +gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb Deleted: portal/trunk/component/common/src/main/java/conf/configuration.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration.properties 2010-01-23 21:51:00 UTC (rev 1433) +++ portal/trunk/component/common/src/main/java/conf/configuration.properties 2010-01-23 21:57:26 UTC (rev 1434) @@ -1,32 +0,0 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - -# Datasource name -gatein.datasource.name=jdbcexo - -# Data -gatein.data.dir=../temp - -# DB -gatein.db.data.dir=${gatein.data.dir}/db - -# JCR -gatein.jcr.data.dir=${gatein.data.dir}/jcr -gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values -gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb Modified: portal/trunk/component/common/src/main/java/conf/configuration.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration.xml 2010-01-23 21:51:00 UTC (rev 1433) +++ portal/trunk/component/common/src/main/java/conf/configuration.xml 2010-01-23 21:57:26 UTC (rev 1434) @@ -31,7 +31,7 @@ <init-params> <value-param profiles="tomcat"> <name>properties.url</name> - <value>jar:/conf/configuration.properties</value> + <value>jar:/conf/configuration-tomcat.properties</value> </value-param> <value-param profiles="jboss"> <name>properties.url</name>