Author: dkatayev Date: 2009-11-24 04:04:33 -0500 (Tue, 24 Nov 2009) New Revision: 819 Added: core/trunk/exo.core.component.database/src/test/resources/conf/standalone/ Removed: core/trunk/exo.core.component.database/src/main/resources/conf/portal/test-configuration.xml core/trunk/exo.core.component.database/src/main/resources/conf/standalone/ Modified: core/trunk/exo.core.component.database/src/test/resources/conf/portal/test-configuration.xml Log: EXOJCR-259 test configuration moved Deleted: core/trunk/exo.core.component.database/src/main/resources/conf/portal/test-configuration.xml =================================================================== --- core/trunk/exo.core.component.database/src/main/resources/conf/portal/test-configuration.xml 2009-11-24 08:57:13 UTC (rev 818) +++ core/trunk/exo.core.component.database/src/main/resources/conf/portal/test-configuration.xml 2009-11-24 09:04:33 UTC (rev 819) @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - 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. - ---> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.services.database.HibernateService</key> - <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> - <init-params> - <properties-param> - <name>hibernate.properties</name> - <description>Default Hibernate Service</description> - <property name="hibernate.show_sql" value="false" /> - <property name="hibernate.cglib.use_reflection_optimizer" value="true" /> - <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:target/temp/data/portal" /> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" /> - <property name="hibernate.connection.autocommit" value="true" /> - <property name="hibernate.connection.username" value="sa" /> - <property name="hibernate.connection.password" value="" /> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> - <property name="hibernate.c3p0.min_size" value="5" /> - <property name="hibernate.c3p0.max_size" value="20" /> - <property name="hibernate.c3p0.timeout" value="1800" /> - <property name="hibernate.c3p0.max_statements" value="50" /> - </properties-param> - </init-params> - </component> - <component> - <key>jcr.datasource</key> - <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> - <init-params> - <properties-param> - <name>hibernate.properties</name> - <description>JCR Workspace datasource</description> - <property name="hibernate.show_sql" value="false" /> - <property name="hibernate.cglib.use_reflection_optimizer" value="true" /> - <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:target/temp/data/jcr" /> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" /> - <property name="hibernate.connection.autocommit" value="true" /> - <property name="hibernate.connection.username" value="sa" /> - <property name="hibernate.connection.password" value="" /> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> - <property name="hibernate.c3p0.min_size" value="5" /> - <property name="hibernate.c3p0.max_size" value="20" /> - <property name="hibernate.c3p0.timeout" value="1800" /> - <property name="hibernate.c3p0.max_statements" value="50" /> - </properties-param> - </init-params> - </component> - <!-- for portal container --> - <import>classpath:/conf/standalone/test-configuration.xml</import> -</configuration> \ No newline at end of file Modified: core/trunk/exo.core.component.database/src/test/resources/conf/portal/test-configuration.xml =================================================================== --- core/trunk/exo.core.component.database/src/test/resources/conf/portal/test-configuration.xml 2009-11-24 08:57:13 UTC (rev 818) +++ core/trunk/exo.core.component.database/src/test/resources/conf/portal/test-configuration.xml 2009-11-24 09:04:33 UTC (rev 819) @@ -79,4 +79,51 @@ </value-param> </init-params> </component> + + <component> + <key>org.exoplatform.services.database.HibernateService</key> + <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> + <init-params> + <properties-param> + <name>hibernate.properties</name> + <description>Default Hibernate Service</description> + <property name="hibernate.show_sql" value="false" /> + <property name="hibernate.cglib.use_reflection_optimizer" value="true" /> + <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:target/temp/data/portal" /> + <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" /> + <property name="hibernate.connection.autocommit" value="true" /> + <property name="hibernate.connection.username" value="sa" /> + <property name="hibernate.connection.password" value="" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> + <property name="hibernate.c3p0.min_size" value="5" /> + <property name="hibernate.c3p0.max_size" value="20" /> + <property name="hibernate.c3p0.timeout" value="1800" /> + <property name="hibernate.c3p0.max_statements" value="50" /> + </properties-param> + </init-params> + </component> + <component> + <key>jcr.datasource</key> + <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> + <init-params> + <properties-param> + <name>hibernate.properties</name> + <description>JCR Workspace datasource</description> + <property name="hibernate.show_sql" value="false" /> + <property name="hibernate.cglib.use_reflection_optimizer" value="true" /> + <property name="hibernate.connection.url" value="jdbc:hsqldb:mem:target/temp/data/jcr" /> + <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" /> + <property name="hibernate.connection.autocommit" value="true" /> + <property name="hibernate.connection.username" value="sa" /> + <property name="hibernate.connection.password" value="" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> + <property name="hibernate.c3p0.min_size" value="5" /> + <property name="hibernate.c3p0.max_size" value="20" /> + <property name="hibernate.c3p0.timeout" value="1800" /> + <property name="hibernate.c3p0.max_statements" value="50" /> + </properties-param> + </init-params> + </component> + <!-- for portal container --> + <import>classpath:/conf/standalone/test-configuration.xml</import> </configuration> Copied: core/trunk/exo.core.component.database/src/test/resources/conf/standalone (from rev 817, core/trunk/exo.core.component.database/src/main/resources/conf/standalone)