[gatein-commits] gatein SVN: r1703 - in portal/trunk/web/portal/src/main/webapp/WEB-INF/conf: organization and 1 other directory.

Author: thomas.heute(a)jboss.com Date: 2010-02-15 14:51:49 -0500 (Mon, 15 Feb 2010) New Revision: 1703 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 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/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-15 19:51:04 UTC (rev 1702) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-15 19:51:49 UTC (rev 1703) @@ -148,10 +148,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr${container.name.suffix}"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${gatein.jcr.datasource.driver}"/> + <property name="url" value="${gatein.jcr.datasource.url}${container.name.suffix}"/> + <property name="username" value="${gatein.jcr.datasource.username}"/> + <property name="password" value="${gatein.jcr.datasource.password}"/> </properties-param> </init-params> </component-plugin> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-02-15 19:51:04 UTC (rev 1702) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-02-15 19:51:49 UTC (rev 1703) @@ -197,10 +197,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm${container.name.suffix}"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${gatein.idm.datasource.driver}"/> + <property name="url" value="${gatein.idm.datasource.url}${container.name.suffix}"/> + <property name="username" value="${gatein.idm.datasource.username}"/> + <property name="password" value="${gatein.idm.datasource.password}"/> </properties-param> </init-params> </component-plugin>