[gatein-commits] gatein SVN: r1701 - in portal/trunk: server/tomcat/patch/src/main/tomcat/bin and 1 other directory.

[do-not-reply at jboss.org]

Author: thomas.heute at jboss.com
Date: 2010-02-15 14:49:18 -0500 (Mon, 15 Feb 2010)
New Revision: 1701

Modified:
   portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
   portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
   portal/trunk/component/common/src/main/java/conf/configuration.xml
   portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh
   portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh
Log:
GTNPORTAL-651: Move property files to a place easy to access
Source of configuration is still in:
  component/common/src/main/java/conf
It gets copied to:
  $JBOSS_HOME/server/default/conf/gatein/configuration.properties
  $TOMCAT_HOME/conf/gatein/configuration.properties
JBoss location for configuration file is found out thanks to component/common/src/main/java/conf/configuration.xml
Tomcat location is defined by setting up parameter in the gatein.sh scripts

Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties	2010-02-15 19:44:40 UTC (rev 1700)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties	2010-02-15 19:49:18 UTC (rev 1701)
@@ -27,11 +27,22 @@
 gatein.jcr.config.type=local
 gatein.jcr.datasource.name=java:jdbcjcr
 gatein.jcr.datasource.dialect=auto
+
+gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr
+gatein.jcr.datasource.username=sa
+gatein.jcr.datasource.password=
+gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver
+
 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
 gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
 
-#IDM
+# IDM
 gatein.idm.datasource.name=java:jdbcidm
 gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
+
+gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm
+gatein.idm.datasource.username=sa
+gatein.idm.datasource.password=
+gatein.idm.datasource.driver=org.hsqldb.jdbcDriver

Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties	2010-02-15 19:44:40 UTC (rev 1700)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties	2010-02-15 19:49:18 UTC (rev 1701)
@@ -27,11 +27,22 @@
 gatein.jcr.config.type=local
 gatein.jcr.datasource.name=jdbcjcr
 gatein.jcr.datasource.dialect=auto
+
+gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr${container.name.suffix}
+gatein.jcr.datasource.username=sa
+gatein.jcr.datasource.password=
+gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver
+
 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
 gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
 
-#IDM
+# IDM
 gatein.idm.datasource.name=jdbcidm
 gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
+
+gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm${container.name.suffix}
+gatein.jcr.datasource.username=sa
+gatein.jcr.datasource.password=
+gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver

Modified: portal/trunk/component/common/src/main/java/conf/configuration.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration.xml	2010-02-15 19:44:40 UTC (rev 1700)
+++ portal/trunk/component/common/src/main/java/conf/configuration.xml	2010-02-15 19:49:18 UTC (rev 1701)
@@ -35,7 +35,7 @@
       </value-param>
       <value-param profiles="jboss">
         <name>properties.url</name>
-        <value>jar:/conf/configuration-jboss.properties</value>
+        <value>${jboss.server.config.url}/gatein/configuration.properties</value>
       </value-param>
     </init-params>
   </component>

Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh	2010-02-15 19:44:40 UTC (rev 1700)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh	2010-02-15 19:49:18 UTC (rev 1701)
@@ -24,7 +24,7 @@
 # Sets some variables
 LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
 SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf"
-EXO_OPTS="-Dexo.product.developing=true"
+EXO_OPTS="-Dexo.product.developing=true -Dexo.properties.url=../conf/gatein/configuration.properties"
 EXO_CONFIG_OPTS="-Xshare:auto -Xms128m -Xmx512m -Dorg.exoplatform.container.configuration.debug"
 
 JPDA_TRANSPORT=dt_socket

Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh	2010-02-15 19:44:40 UTC (rev 1700)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh	2010-02-15 19:49:18 UTC (rev 1701)
@@ -27,7 +27,7 @@
 # Sets some variables
 LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
 SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf"
-EXO_OPTS="-Dexo.product.developing=false"
+EXO_OPTS="-Dexo.product.developing=false -Dexo.properties.url=../conf/gatein/configuration.properties"
 
 JAVA_OPTS="-Xshare:auto -Xms128m -Xmx512m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
 export JAVA_OPTS