[exo-jcr-commits] exo-jcr SVN: r5409 - in jcr/branches/1.15.x: exo.jcr.component.core/src/main/resources/conf/portal and 11 other directories.

Author: tolusha Date: 2011-12-30 04:39:06 -0500 (Fri, 30 Dec 2011) New Revision: 5409 Removed: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-configuration.xml jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml jcr/branches/1.15.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-jcr-config.xml Log: EXOJCR-803: Removed StorageUpdateManager feature Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-12-30 09:39:06 UTC (rev 5409) @@ -57,7 +57,6 @@ import org.exoplatform.services.jcr.impl.storage.jdbc.init.PgSQLDBInitializer; import org.exoplatform.services.jcr.impl.storage.jdbc.init.StorageDBInitializer; import org.exoplatform.services.jcr.impl.storage.jdbc.statistics.StatisticsJDBCStorageConnection; -import org.exoplatform.services.jcr.impl.storage.jdbc.update.StorageUpdateManager; import org.exoplatform.services.jcr.impl.storage.value.fs.FileValueStorage; import org.exoplatform.services.jcr.impl.util.io.DirectoryHelper; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; @@ -464,12 +463,6 @@ initDatabase(); - // enableStorageUpdate left unchanged since it is never used in StorageUpdateManager.checkVersion - boolean enableStorageUpdate = false; - this.storageVersion = - StorageUpdateManager.checkVersion(dbSourceName, this.connFactory.getJdbcConnection(), multiDb, - enableStorageUpdate); - LOG.info(getInfo()); } Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -31,7 +31,6 @@ <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" /> </properties> @@ -77,7 +76,6 @@ <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" /> </properties> @@ -123,7 +121,6 @@ <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-jbc-config.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -31,7 +31,6 @@ <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" /> </properties> @@ -99,7 +98,6 @@ <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" /> </properties> @@ -167,7 +165,6 @@ <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.db2v8.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.h2.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ingres.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam-utf8.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(56) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -) ENGINE=MyISAM; CREATE TABLE JCR_MITEM( ID VARCHAR(56) NOT NULL, PARENT_ID VARCHAR(56) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-myisam.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -) ENGINE=MyISAM; CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql-utf8.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(56) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -) ENGINE=InnoDB; CREATE TABLE JCR_MITEM( ID VARCHAR(56) NOT NULL, PARENT_ID VARCHAR(56) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mysql.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -) ENGINE=InnoDB; CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora-analyze.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,9 +1,4 @@ /*$DELIMITER:/ */ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR2(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -) -/ CREATE TABLE JCR_MITEM( ID VARCHAR2(96) NOT NULL, PARENT_ID VARCHAR2(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.ora.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,9 +1,4 @@ /*$DELIMITER:/ */ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR2(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -) -/ CREATE TABLE JCR_MITEM( ID VARCHAR2(96) NOT NULL, PARENT_ID VARCHAR2(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_MCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_MITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.h2.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ingres.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam-utf8.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(56) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -) ENGINE=MyISAM; CREATE TABLE JCR_SITEM( ID VARCHAR(56) NOT NULL, PARENT_ID VARCHAR(56) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-myisam.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -) ENGINE=MyISAM; CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(56) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -) ENGINE=InnoDB; CREATE TABLE JCR_SITEM( ID VARCHAR(56) NOT NULL, PARENT_ID VARCHAR(56) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -) ENGINE=InnoDB; CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora-analyze.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,9 +1,4 @@ /*$DELIMITER:/ */ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR2(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -) -/ CREATE TABLE JCR_SITEM( ID VARCHAR2(96) NOT NULL, PARENT_ID VARCHAR2(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.ora.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,9 +1,4 @@ /*$DELIMITER:/ */ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR2(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -) -/ CREATE TABLE JCR_SITEM( ID VARCHAR2(96) NOT NULL, PARENT_ID VARCHAR2(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.pgsql.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sybase.sql 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,7 +1,3 @@ -CREATE TABLE JCR_SCONTAINER( - VERSION VARCHAR(96) NOT NULL, - CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION) -); CREATE TABLE JCR_SITEM( ID VARCHAR(96) NOT NULL, PARENT_ID VARCHAR(96) NOT NULL, Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/TestSingleDbJDBCConnection.java 2011-12-30 09:39:06 UTC (rev 5409) @@ -79,7 +79,6 @@ st.executeUpdate("drop table JCR_SREF"); st.executeUpdate("drop table JCR_SVALUE"); st.executeUpdate("drop table JCR_SITEM"); - st.executeUpdate("drop table JCR_SCONTAINER"); st.close(); } catch (SQLException se) Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/util/TesterConfigurationHelper.java 2011-12-30 09:39:06 UTC (rev 5409) @@ -301,7 +301,6 @@ params.add(new SimpleParameterEntry("source-name", dsName)); params.add(new SimpleParameterEntry("db-type", "generic")); params.add(new SimpleParameterEntry("multi-db", isMultiDb ? "true" : "false")); - params.add(new SimpleParameterEntry("update-storage", "true")); params.add(new SimpleParameterEntry("max-buffer-size", "204800")); if (dbDialect != null) Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -24,7 +24,6 @@ <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws" /> <property name="dialect" value="auto" /> @@ -95,7 +94,6 @@ <properties> <property name="source-name" value="jdbcjcr1" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1" /> <property name="dialect" value="auto" /> @@ -171,7 +169,6 @@ <properties> <property name="source-name" value="jdbcjcr2" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2" /> <property name="dialect" value="auto" /> @@ -248,7 +245,6 @@ <properties> <property name="source-name" value="jdbcjcr3" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws3" /> <property name="dialect" value="auto" /> @@ -350,7 +346,6 @@ <properties> <property name="source-name" value="jdbcjcrdb2" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wsdb2" /> <property name="dialect" value="auto" /> @@ -420,7 +415,6 @@ <properties> <property name="source-name" value="jdbcjcr1db2" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1db2" /> <property name="dialect" value="auto" /> @@ -501,7 +495,6 @@ <properties> <property name="source-name" value="jdbcjcrtck" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wstck" /> <property name="dialect" value="auto" /> @@ -584,7 +577,6 @@ <properties> <property name="source-name" value="jdbcjcr1tck" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1tck" /> <property name="dialect" value="auto" /> @@ -665,7 +657,6 @@ <properties> <property name="source-name" value="jdbcjcr2tck" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2tck" /> <property name="dialect" value="auto" /> Deleted: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-configuration.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-configuration.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-configuration.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,198 +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.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.category.jcr.FileCleaner" value="DEBUG"/> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/sql-benchmark-jcr-config.xml</value> - </value-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>5</value> - </value-param> - </init-params> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <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>jdbcexo</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:3306/exodb?relaxAutoCommit=true&amp;autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=utf8"/> - <property name="username" value="root"/> - <property name="password" value="root"/> - <property name="maxActive" value="50" /> - <property name="maxIdle" value="5" /> - <property name="initialSize" value="50" /> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> -</configuration> Deleted: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/sql-benchmark-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -1,474 +0,0 @@ -<repository-service default-repository="repository"> - <repositories> - <repository name="repository1" system-workspace="system" - default-workspace="collaboration"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="system"> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo" /> - <property name="dialect" value="MySQL" /> - <!--<property name="dialect" value="hsqldb"/>--> - <property name="multi-db" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/system" /> - </properties> - <value-storages> - <value-storage id="system" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/system" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer - class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="20k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> -<!-- <query-handler--> -<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">--> -<!-- <properties>--> -<!-- <property name="index-dir" value="../temp/jcrlucenedb/system" />--> -<!-- <property name="support-highlighting" value="true" />--> -<!-- <property name="excerptprovider-class"--> -<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />--> -<!-- </properties>--> -<!-- </query-handler>--> - <lock-manager> - <time-out>15m</time-out> - <persister - class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/system" /> - </properties> - </persister> - </lock-manager> - </workspace> - <workspace name="collaboration"> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo" /> - <property name="dialect" value="MySQL" /> - <!--<property name="dialect" value="hsqldb"/> --> - <property name="multi-db" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/collaboration" /> - </properties> - <value-storages> - <value-storage id="collaboration" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/collaboration" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer - class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="20k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> -<!-- <query-handler--> -<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">--> -<!-- <properties>--> -<!-- <property name="index-dir" value="../temp/jcrlucenedb/collaboration" />--> -<!-- <property name="support-highlighting" value="true" />--> -<!-- <property name="excerptprovider-class"--> -<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />--> -<!-- </properties>--> -<!-- </query-handler>--> - <lock-manager> - <time-out>15m</time-out> - <persister - class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/collaboration" /> - </properties> - </persister> - </lock-manager> - </workspace> - <workspace name="backup"> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo" /> - <property name="dialect" value="MySQL" /> - <!--<property name="dialect" value="hsqldb"/> --> - <property name="multi-db" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/backup" /> - </properties> - <value-storages> - <value-storage id="backup" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/backup" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer - class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> -<!-- <query-handler--> -<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">--> -<!-- <properties>--> -<!-- <property name="index-dir" value="../temp/jcrlucenedb/backup" />--> -<!-- <property name="support-highlighting" value="true" />--> -<!-- <property name="excerptprovider-class"--> -<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />--> -<!-- </properties>--> -<!-- </query-handler>--> - <lock-manager> - <time-out>15m</time-out> - <persister - class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/backup" /> - </properties> - </persister> - </lock-manager> - </workspace> - <workspace name="gadgets"> - <!-- for system storage --> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo" /> - <property name="dialect" value="MySQL" /> - <!--<property name="dialect" value="hsqldb"/> --> - <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/gadgets" /> - </properties> - <value-storages> - <value-storage id="gadgets" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/gadgets" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer - class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="20k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> -<!-- <query-handler--> -<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">--> -<!-- <properties>--> -<!-- <property name="index-dir" value="../temp/jcrlucenedb/gadgets" />--> -<!-- </properties>--> -<!-- </query-handler>--> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister - class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/gadgets" /> - </properties> - </persister> - </lock-manager> - </workspace> - </workspaces> - </repository> - <repository name="repository2" system-workspace="system" - default-workspace="collaboration"> - <security-domain>exo-domain</security-domain> - <access-control>optional</access-control> - <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> - <workspaces> - <workspace name="system"> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo" /> - <property name="dialect" value="MySQL" /> - <!--<property name="dialect" value="hsqldb"/>--> - <property name="multi-db" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/system" /> - </properties> - <value-storages> - <value-storage id="system" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/system" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer - class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="20k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> -<!-- <query-handler--> -<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">--> -<!-- <properties>--> -<!-- <property name="index-dir" value="../temp/jcrlucenedb/system2" />--> -<!-- <property name="support-highlighting" value="true" />--> -<!-- <property name="excerptprovider-class"--> -<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />--> -<!-- </properties>--> -<!-- </query-handler>--> - <lock-manager> - <time-out>15m</time-out> - <persister - class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/system" /> - </properties> - </persister> - </lock-manager> - </workspace> - <workspace name="collaboration"> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo" /> - <property name="dialect" value="MySQL" /> - <!--<property name="dialect" value="hsqldb"/> --> - <property name="multi-db" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/collaboration" /> - </properties> - <value-storages> - <value-storage id="collaboration" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/collaboration" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer - class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="20k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> -<!-- <query-handler--> -<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">--> -<!-- <properties>--> -<!-- <property name="index-dir" value="../temp/jcrlucenedb/collaboration2" />--> -<!-- <property name="support-highlighting" value="true" />--> -<!-- <property name="excerptprovider-class"--> -<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />--> -<!-- </properties>--> -<!-- </query-handler>--> - <lock-manager> - <time-out>15m</time-out> - <persister - class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/collaboration" /> - </properties> - </persister> - </lock-manager> - </workspace> - <workspace name="backup"> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo" /> - <property name="dialect" value="MySQL" /> - <!--<property name="dialect" value="hsqldb"/> --> - <property name="multi-db" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/backup" /> - </properties> - <value-storages> - <value-storage id="backup" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/backup" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer - class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="5k" /> - <property name="live-time" value="20m" /> - </properties> - </cache> -<!-- <query-handler--> -<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">--> -<!-- <properties>--> -<!-- <property name="index-dir" value="../temp/jcrlucenedb/backup2" />--> -<!-- <property name="support-highlighting" value="true" />--> -<!-- <property name="excerptprovider-class"--> -<!-- value="org.exoplatform.services.jcr.impl.core.query.lucene.DefaultHTMLExcerpt" />--> -<!-- </properties>--> -<!-- </query-handler>--> - <lock-manager> - <time-out>15m</time-out> - <persister - class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/backup" /> - </properties> - </persister> - </lock-manager> - </workspace> - <workspace name="gadgets"> - <!-- for system storage --> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcexo" /> - <property name="dialect" value="MySQL" /> - <!--<property name="dialect" value="hsqldb"/> --> - <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="../temp/swap/gadgets" /> - </properties> - <value-storages> - <value-storage id="gadgets" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="../temp/values/gadgets" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer - class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> - </properties> - </initializer> - <cache enabled="true" - class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> - <properties> - <property name="max-size" value="20k" /> - <property name="live-time" value="1h" /> - </properties> - </cache> -<!-- <query-handler--> -<!-- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">--> -<!-- <properties>--> -<!-- <property name="index-dir" value="../temp/jcrlucenedb/gadgets2" />--> -<!-- </properties>--> -<!-- </query-handler>--> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister - class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="../temp/lock/gadgets" /> - </properties> - </persister> - </lock-manager> - </workspace> - </workspaces> - </repository> - </repositories> -</repository-service> Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -35,7 +35,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws" /> </properties> @@ -96,7 +95,6 @@ <property name="source-name" value="jdbcjcr1" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1" /> </properties> @@ -155,7 +153,6 @@ <property name="source-name" value="jdbcjcr2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2" /> </properties> @@ -215,7 +212,6 @@ <property name="source-name" value="jdbcjcr3" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws3" /> </properties> @@ -305,7 +301,6 @@ <property name="source-name" value="jdbcjcrdb2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wsdb2" /> </properties> @@ -364,7 +359,6 @@ <property name="source-name" value="jdbcjcr1db2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1db2" /> </properties> @@ -432,7 +426,6 @@ <property name="source-name" value="jdbcjcrtck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wstck" /> </properties> @@ -500,7 +493,6 @@ <property name="source-name" value="jdbcjcr1tck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1tck" /> </properties> @@ -567,7 +559,6 @@ <property name="source-name" value="jdbcjcr2tck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2tck" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -35,7 +35,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws" /> </properties> @@ -97,7 +96,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1" /> </properties> @@ -157,7 +155,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2" /> </properties> @@ -218,7 +215,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws3" /> </properties> @@ -312,7 +308,6 @@ <property name="source-name" value="jdbcjcrdb2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wsdb2" /> </properties> @@ -371,7 +366,6 @@ <property name="source-name" value="jdbcjcrdb2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1db2" /> </properties> @@ -439,7 +433,6 @@ <property name="source-name" value="jdbcjcrtck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wstck" /> </properties> @@ -507,7 +500,6 @@ <property name="source-name" value="jdbcjcrtck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1tck" /> </properties> @@ -574,7 +566,6 @@ <property name="source-name" value="jdbcjcrtck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2tck" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -31,7 +31,6 @@ <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/production" /> </properties> @@ -92,7 +91,6 @@ <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/backup" /> </properties> @@ -153,7 +151,6 @@ <properties> <property name="source-name" value="jdbcjcr" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="${exo.jcr.parent.dir:..}/temp/swap/digital-assets" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -25,7 +25,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws" /> </properties> @@ -94,7 +93,6 @@ <property name="source-name" value="jdbcjcr1" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1" /> </properties> @@ -161,7 +159,6 @@ <property name="source-name" value="jdbcjcr2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2" /> </properties> @@ -229,7 +226,6 @@ <property name="source-name" value="jdbcjcr3" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws3" /> </properties> @@ -329,7 +325,6 @@ <property name="source-name" value="jdbcjcrdb2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wsdb2" /> </properties> @@ -395,7 +390,6 @@ <property name="source-name" value="jdbcjcr1db2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1db2" /> </properties> @@ -470,7 +464,6 @@ <property name="source-name" value="jdbcjcrtck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wstck" /> </properties> @@ -545,7 +538,6 @@ <property name="source-name" value="jdbcjcr1tck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1tck" /> </properties> @@ -619,7 +611,6 @@ <property name="source-name" value="jdbcjcr2tck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2tck" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -35,7 +35,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws" /> </properties> @@ -92,7 +91,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1" /> </properties> @@ -146,7 +144,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2" /> </properties> @@ -201,7 +198,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws3" /> </properties> @@ -287,7 +283,6 @@ <property name="source-name" value="jdbcjcrdb2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wsdb2" /> </properties> @@ -341,7 +336,6 @@ <property name="source-name" value="jdbcjcrdb2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1db2" /> </properties> @@ -406,7 +400,6 @@ <property name="source-name" value="jdbcjcrtck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wstck" /> </properties> @@ -467,7 +460,6 @@ <property name="source-name" value="jdbcjcrtck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1tck" /> </properties> @@ -527,7 +519,6 @@ <property name="source-name" value="jdbcjcrtck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2tck" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -35,7 +35,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws" /> </properties> @@ -92,7 +91,6 @@ <property name="source-name" value="jdbcjcr1" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1" /> </properties> @@ -146,7 +144,6 @@ <property name="source-name" value="jdbcjcr2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2" /> </properties> @@ -201,7 +198,6 @@ <property name="source-name" value="jdbcjcr3" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws3" /> </properties> @@ -287,7 +283,6 @@ <property name="source-name" value="jdbcjcrdb2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wsdb2" /> </properties> @@ -341,7 +336,6 @@ <property name="source-name" value="jdbcjcr1db2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1db2" /> </properties> @@ -406,7 +400,6 @@ <property name="source-name" value="jdbcjcrtck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/wstck" /> </properties> @@ -467,7 +460,6 @@ <property name="source-name" value="jdbcjcr1tck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1tck" /> </properties> @@ -527,7 +519,6 @@ <property name="source-name" value="jdbcjcr2tck" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2tck" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -30,7 +30,6 @@ <properties> <property name="source-name" value="jdbcjcr6" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db3ws" /> </properties> @@ -71,7 +70,6 @@ <properties> <property name="source-name" value="jdbcjcr6" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db3ws1" /> </properties> @@ -119,7 +117,6 @@ <properties> <property name="source-name" value="jdbcjcr7" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db4ws" /> </properties> @@ -160,7 +157,6 @@ <properties> <property name="source-name" value="jdbcjcr8" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db4ws1" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-replication.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -35,7 +35,6 @@ <property name="source-name" value="jdbcjcr2" /> <property name="dialect" value="generic" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp1/swap/ws" /> </properties> @@ -77,7 +76,6 @@ <property name="source-name" value="jdbcjcr1" /> <property name="dialect" value="generic" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="204800" /> <property name="swap-directory" value="target/temp2/swap/ws" /> </properties> @@ -128,7 +126,6 @@ <property name="source-name" value="jdbcjcr1" /> <property name="dialect" value="generic" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="204800" /> <property name="swap-directory" value="target/temp1/swap/ws" /> </properties> @@ -170,7 +167,6 @@ <property name="source-name" value="jdbcjcr1" /> <property name="dialect" value="generic" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="204800" /> <property name="swap-directory" value="target/temp1/swap/ws" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -32,7 +32,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws" /> </properties> @@ -65,7 +64,6 @@ <property name="source-name" value="jdbcjcr1" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1" /> </properties> @@ -88,7 +86,6 @@ <property name="source-name" value="jdbcjcr2" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2" /> </properties> @@ -111,7 +108,6 @@ <property name="source-name" value="jdbcjcr3" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws3" /> </properties> @@ -134,7 +130,6 @@ <property name="source-name" value="jdbcjcr4" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws4" /> </properties> @@ -157,7 +152,6 @@ <property name="source-name" value="jdbcjcr5" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws5" /> </properties> @@ -188,7 +182,6 @@ <property name="source-name" value="jdbcjcr19" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db2_ws" /> </properties> @@ -218,7 +211,6 @@ <properties> <property name="source-name" value="jdbcjcr6" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db3ws" /> </properties> @@ -259,7 +251,6 @@ <properties> <property name="source-name" value="jdbcjcr6" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db3ws1" /> </properties> @@ -307,7 +298,6 @@ <properties> <property name="source-name" value="jdbcjcr7" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db4ws" /> </properties> @@ -348,7 +338,6 @@ <properties> <property name="source-name" value="jdbcjcr8" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db4ws1" /> </properties> @@ -398,7 +387,6 @@ <property name="source-name" value="jdbcjcr21" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db5_ws" /> </properties> @@ -422,7 +410,6 @@ <property name="source-name" value="jdbcjcr23" /> <property name="dialect" value="auto" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db5_ws1" /> </properties> @@ -453,7 +440,6 @@ <property name="source-name" value="jdbcjcr24" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db6_ws" /> </properties> @@ -476,7 +462,6 @@ <property name="source-name" value="jdbcjcr25" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db6_ws1" /> </properties> @@ -499,7 +484,6 @@ <property name="source-name" value="jdbcjcr26" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db6_ws2" /> </properties> @@ -531,7 +515,6 @@ <property name="source-name" value="jdbcjcr_to_repository_restore_singel_db" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db7_ws" /> </properties> @@ -564,7 +547,6 @@ <property name="source-name" value="jdbcjcr_to_repository_restore_singel_db" /> <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/db7_ws1" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -31,10 +31,7 @@ <properties> <property name="sourceName" value="jdbcjcr" /> <property name="dialect" value="generic" /> - <!-- example of direct jdbc connection usage (without JNDI), see docs for details --> - <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="204800" /> <property name="swap-directory" value="target/temp/swap/ws" /> </properties> @@ -59,15 +56,14 @@ </persister> </lock-manager> </workspace> + <workspace name="ws2" auto-init-root-nodetype="nt:unstructured"> <!-- for system storage --> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="sourceName" value="jdbcjcr" /> <property name="dialect" value="generic" /> - <!-- example of direct jdbc connection usage (without JNDI), see docs for details --> <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> <property name="max-buffer-size" value="204800" /> <property name="swap-directory" value="target/temp/swap/ws2" /> </properties> Modified: jcr/branches/1.15.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-jcr-config.xml =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 08:52:49 UTC (rev 5408) +++ jcr/branches/1.15.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-jcr-config.xml 2011-12-30 09:39:06 UTC (rev 5409) @@ -32,7 +32,6 @@ <property name="source-name" value="jdbcjcr" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws" /> </properties> @@ -83,7 +82,6 @@ <property name="source-name" value="jdbcjcr1" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws1" /> </properties> @@ -117,7 +115,6 @@ <property name="source-name" value="jdbcjcr2" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> <property name="swap-directory" value="target/temp/swap/ws2" /> </properties>