Author: mpodolin Date: 2010-04-07 10:42:23 -0400 (Wed, 07 Apr 2010) New Revision: 2526 Removed: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-tomcat.properties Modified: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-jboss.properties Log: configuration properties altered according to EPP config.; removed tomcat related stuff Modified: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2010-04-07 13:29:49 UTC (rev 2525) +++ portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2010-04-07 14:42:23 UTC (rev 2526) @@ -25,12 +25,8 @@ # JCR gatein.jcr.config.type=local -gatein.jcr.datasource.name=java:jdbcjcr +gatein.jcr.datasource.name=java:gatein-jcr gatein.jcr.datasource.dialect=auto -gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr_${name} -gatein.jcr.datasource.username=sa -gatein.jcr.datasource.password= gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values @@ -38,11 +34,7 @@ gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter # IDM -gatein.idm.datasource.name=java:jdbcidm -gatein.idm.datasource.driver=org.hsqldb.jdbcDriver -gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm_${name} -gatein.idm.datasource.username=sa -gatein.idm.datasource.password= +gatein.idm.datasource.name=java:gatein-idm # EMail gatein.email.smtp.username= @@ -53,4 +45,3 @@ gatein.email.smtp.auth=true gatein.email.smtp.socketFactory.port=465 gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory - Deleted: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-tomcat.properties =================================================================== --- portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-tomcat.properties 2010-04-07 13:29:49 UTC (rev 2525) +++ portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-tomcat.properties 2010-04-07 14:42:23 UTC (rev 2526) @@ -1,58 +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. -# - -# Data -gatein.data.dir=../gatein/data - -# DB -gatein.db.data.dir=${gatein.data.dir}/db - -# JCR -gatein.jcr.config.type=local -gatein.jcr.datasource.name=jdbcjcr -gatein.jcr.datasource.dialect=auto -gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr_${name} -gatein.jcr.datasource.username=sa -gatein.jcr.datasource.password= - -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}/lucene -gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter - -# IDM -gatein.idm.datasource.name=jdbcidm -gatein.idm.datasource.driver=org.hsqldb.jdbcDriver -gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm_${name} -gatein.idm.datasource.username=sa -gatein.idm.datasource.password= - -# Arjuna configuration -com.arjuna.ats.arjuna.objectstore.objectStoreDir=${gatein.data.dir}/jta - -# EMail -gatein.email.smtp.username= -gatein.email.smtp.password= -gatein.email.smtp.host=smtp.gmail.com -gatein.email.smtp.port=465 -gatein.email.smtp.starttls.enable=true -gatein.email.smtp.auth=true -gatein.email.smtp.socketFactory.port=465 -gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory \ No newline at end of file