[exo-jcr-commits] exo-jcr SVN: r5925 - in jcr/trunk: exo.jcr.component.ext/src/test/resources/conf/standalone and 1 other directory.

Author: tolusha Date: 2012-03-21 03:10:51 -0400 (Wed, 21 Mar 2012) New Revision: 5925 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mysql.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-pgsql.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-sybase.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml Log: EXOJCR-1754: testing on DB, fix bugs Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java 2012-03-20 15:38:57 UTC (rev 5924) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCWorkspaceDataContainer.java 2012-03-21 07:10:51 UTC (rev 5925) @@ -97,14 +97,13 @@ { LOG.warn(DBConstants.DB_DIALECT_ORACLEOCI + " dialect is experimental!"); this.connFactory = new DefaultOracleConnectionFactory(getDataSource(), containerConfig); - - // a particular db initializer may be configured here too dbInitializer = new OracleDBInitializer(this.connFactory.getJdbcConnection(), containerConfig); } else if (containerConfig.dbDialect == DBConstants.DB_DIALECT_ORACLE) { this.connFactory = new DefaultOracleConnectionFactory(getDataSource(), containerConfig); + dbInitializer = new OracleDBInitializer(this.connFactory.getJdbcConnection(), containerConfig); } else if (containerConfig.dbDialect == DBConstants.DB_DIALECT_PGSQL) { @@ -140,7 +139,7 @@ } else if (containerConfig.dbDialect == DBConstants.DB_DIALECT_DB2) { - new DB2ConnectionFactory(getDataSource(), containerConfig); + this.connFactory = new DB2ConnectionFactory(getDataSource(), containerConfig); dbInitializer = defaultDBInitializer(); } else if (containerConfig.dbDialect == DBConstants.DB_DIALECT_DB2V8) Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml 2012-03-20 15:38:57 UTC (rev 5924) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml 2012-03-21 07:10:51 UTC (rev 5925) @@ -230,7 +230,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2_ws" /> + <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2" /> <property name="username" value="db2inst1" /> <property name="password" value="eXoAdmin" /> </properties-param> @@ -243,7 +243,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr30</value> + <value>jdbcjcr8</value> </value-param> <value-param> <name>class-name</name> @@ -256,10 +256,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:target/temp/data/db8ws" /> - <property name="username" value="sa" /> - <property name="password" value="" /> + <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> + <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws" /> + <property name="username" value="db2inst1" /> + <property name="password" value="eXoAdmin" /> </properties-param> </init-params> </component-plugin> @@ -270,7 +270,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr31</value> + <value>jdbcjcr9</value> </value-param> <value-param> <name>class-name</name> @@ -283,35 +283,8 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db8ws2" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr8</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2_ws1" /> + <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws1" /> <property name="username" value="db2inst1" /> <property name="password" value="eXoAdmin" /> </properties-param> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mysql.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mysql.xml 2012-03-20 15:38:57 UTC (rev 5924) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mysql.xml 2012-03-21 07:10:51 UTC (rev 5925) @@ -230,7 +230,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db2_ws" /> + <property name="url" value="jdbc:mysql://localhost/db2" /> <property name="username" value="root" /> <property name="password" value="eXoAdmin" /> </properties-param> @@ -243,7 +243,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr30</value> + <value>jdbcjcr8</value> </value-param> <value-param> <name>class-name</name> @@ -256,10 +256,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:target/temp/data/db8ws" /> - <property name="username" value="sa" /> - <property name="password" value="" /> + <property name="driverClassName" value="com.mysql.jdbc.Driver" /> + <property name="url" value="jdbc:mysql://localhost/db1_ws" /> + <property name="username" value="root" /> + <property name="password" value="eXoAdmin" /> </properties-param> </init-params> </component-plugin> @@ -270,7 +270,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr31</value> + <value>jdbcjcr9</value> </value-param> <value-param> <name>class-name</name> @@ -283,41 +283,12 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db8ws2" /> - <property name="username" value="sa" /> - <property name="password" value="" /> + <property name="driverClassName" value="com.mysql.jdbc.Driver" /> + <property name="url" value="jdbc:mysql://localhost/db1_ws1" /> + <property name="username" value="root" /> + <property name="password" value="eXoAdmin" /> </properties-param> </init-params> </component-plugin> - - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr8</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db2_ws1" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> </configuration> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml 2012-03-20 15:38:57 UTC (rev 5924) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml 2012-03-21 07:10:51 UTC (rev 5925) @@ -236,60 +236,6 @@ </properties-param> </init-params> </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr30</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db8ws" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr31</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db8ws2" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> <component-plugin> <name>bind.datasource</name> <set-method>addPlugin</set-method> @@ -317,5 +263,32 @@ </properties-param> </init-params> </component-plugin> + <component-plugin> + <name>bind.datasource</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.naming.BindReferencePlugin</type> + <init-params> + <value-param> + <name>bind-name</name> + <value>jdbcjcr9</value> + </value-param> + <value-param> + <name>class-name</name> + <value>javax.sql.DataSource</value> + </value-param> + <value-param> + <name>factory</name> + <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> + </value-param> + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> + <property name="driverClassName" value="oracle.jdbc.OracleDriver" /> + <property name="url" value="jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm" /> + <property name="username" value="exoperf3" /> + <property name="password" value="exo12321" /> + </properties-param> + </init-params> + </component-plugin> </external-component-plugins> </configuration> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-pgsql.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-pgsql.xml 2012-03-20 15:38:57 UTC (rev 5924) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-pgsql.xml 2012-03-21 07:10:51 UTC (rev 5925) @@ -231,67 +231,13 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db1_ws" /> + <property name="url" value="jdbc:postgresql://localhost:5433/db2" /> <property name="username" value="root" /> <property name="password" value="eXoAdmin" /> <property name="maxActive" value="20" /> </properties-param> </init-params> </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr30</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db8ws" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr31</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db8ws2" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> <component-plugin> <name>bind.datasource</name> <set-method>addPlugin</set-method> @@ -313,6 +259,34 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.postgresql.Driver" /> + <property name="url" value="jdbc:postgresql://localhost:5433/db1_ws" /> + <property name="username" value="root" /> + <property name="password" value="eXoAdmin" /> + <property name="maxActive" value="20" /> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>bind.datasource</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.naming.BindReferencePlugin</type> + <init-params> + <value-param> + <name>bind-name</name> + <value>jdbcjcr9</value> + </value-param> + <value-param> + <name>class-name</name> + <value>javax.sql.DataSource</value> + </value-param> + <value-param> + <name>factory</name> + <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> + </value-param> + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> + <property name="driverClassName" value="org.postgresql.Driver" /> <property name="url" value="jdbc:postgresql://localhost:5433/db1_ws1" /> <property name="username" value="root" /> <property name="password" value="eXoAdmin" /> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-sybase.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-sybase.xml 2012-03-20 15:38:57 UTC (rev 5924) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-sybase.xml 2012-03-21 07:10:51 UTC (rev 5925) @@ -230,7 +230,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db2_ws" /> + <property name="url" value="jdbc:sybase:Tds:localhost:5003/db2" /> <property name="username" value="sa" /> <property name="password" value="" /> </properties-param> @@ -243,7 +243,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr30</value> + <value>jdbcjcr8</value> </value-param> <value-param> <name>class-name</name> @@ -256,10 +256,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:target/temp/data/db8ws" /> - <property name="username" value="sa" /> - <property name="password" value="" /> + <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> + <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1_ws" /> + <property name="username" value="sa" /> + <property name="password" value="" /> </properties-param> </init-params> </component-plugin> @@ -270,7 +270,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr31</value> + <value>jdbcjcr9</value> </value-param> <value-param> <name>class-name</name> @@ -283,35 +283,8 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db8ws2" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr8</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db2_ws1" /> + <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1_ws1" /> <property name="username" value="sa" /> <property name="password" value="" /> </properties-param> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup.xml 2012-03-20 15:38:57 UTC (rev 5924) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup.xml 2012-03-21 07:10:51 UTC (rev 5925) @@ -230,7 +230,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db4ws" /> + <property name="url" value="jdbc:hsqldb:file:target/temp/data/db4" /> <property name="username" value="sa" /> <property name="password" value="" /> </properties-param> @@ -257,33 +257,6 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db4ws2" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr30</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> <property name="url" value="jdbc:hsqldb:file:target/temp/data/db8ws" /> <property name="username" value="sa" /> <property name="password" value="" /> @@ -297,7 +270,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr31</value> + <value>jdbcjcr9</value> </value-param> <value-param> <name>class-name</name> @@ -311,7 +284,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db8ws2" /> + <property name="url" value="jdbc:hsqldb:file:target/temp/data/db8ws1" /> <property name="username" value="sa" /> <property name="password" value="" /> </properties-param> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml 2012-03-20 15:38:57 UTC (rev 5924) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml 2012-03-21 07:10:51 UTC (rev 5925) @@ -191,7 +191,7 @@ <workspace name="ws1"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcjcr8" /> + <property name="source-name" value="jdbcjcr7" /> <property name="db-structure-type" value="isolated" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db4ws1" /> @@ -234,7 +234,7 @@ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr8" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr7" /> <property name="jbosscache-shareable" value="true" /> </properties> </lock-manager> @@ -250,7 +250,7 @@ <workspace name="ws"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcjcr30" /> + <property name="source-name" value="jdbcjcr8" /> <property name="db-structure-type" value="multi" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db4ws" /> @@ -293,7 +293,7 @@ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr30" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr8" /> <property name="jbosscache-shareable" value="true" /> </properties> </lock-manager> @@ -302,7 +302,7 @@ <workspace name="ws1"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcjcr31" /> + <property name="source-name" value="jdbcjcr9" /> <property name="db-structure-type" value="multi" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db8ws1" /> @@ -345,7 +345,7 @@ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> - <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr31" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr9" /> <property name="jbosscache-shareable" value="true" /> </properties> </lock-manager>