Author: nzamosenchuk Date: 2011-11-15 10:19:02 -0500 (Tue, 15 Nov 2011) New Revision: 5190 Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/usecase/TestBackupRestore.java jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mssql.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mysql.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-pgsql.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-sybase.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml Log: EXOJCR-1611 : fix configuration Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/usecase/TestBackupRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/usecase/TestBackupRestore.java 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/usecase/TestBackupRestore.java 2011-11-15 15:19:02 UTC (rev 5190) @@ -73,100 +73,100 @@ public void testBackupRestoreExistingRepositorySingleDB() throws Exception { - repositoryBackupRestore("db1"); - repositoryBackupRestore("db1"); + repositoryBackupRestore("db3"); + repositoryBackupRestore("db3"); } public void testBackupRestoreExistingRepositoryMultiDB() throws Exception { - repositoryBackupRestore("db2"); - repositoryBackupRestore("db2"); + repositoryBackupRestore("db4"); + repositoryBackupRestore("db4"); } public void testBackupRestoreExistingWorkspaceSingleDB() throws Exception { - workspaceBackupRestore("db1"); - workspaceBackupRestore("db1"); + workspaceBackupRestore("db3"); + workspaceBackupRestore("db3"); } public void testBackupRestoreExistingWorkspaceMultiDB() throws Exception { - workspaceBackupRestore("db2"); - workspaceBackupRestore("db2"); + workspaceBackupRestore("db4"); + workspaceBackupRestore("db4"); } - // public void testJobExistingRepositorySameConfigRestoreSingleDB() throws Exception - // { - // repositoryBackupRestoreDirectlyOverJobExistingRepositorySameConfigRestore("db1"); - // repositoryBackupRestoreDirectlyOverJobExistingRepositorySameConfigRestore("db1"); - // } - // - // public void testJobExistingRepositorySameConfigRestoreMultiDB() throws Exception - // { - // repositoryBackupRestoreDirectlyOverJobExistingRepositorySameConfigRestore("db2"); - // repositoryBackupRestoreDirectlyOverJobExistingRepositorySameConfigRestore("db2"); - // } - // - // public void testJobExistingRepositoryRestoreSingleDB() throws Exception - // { - // repositoryBackupRestoreDirectlyOverJobExistingRepositoryRestore("db1"); - // repositoryBackupRestoreDirectlyOverJobExistingRepositoryRestore("db1"); - // } - // - // public void testJobExistingRepositoryRestoreMultiDB() throws Exception - // { - // repositoryBackupRestoreDirectlyOverJobExistingRepositoryRestore("db2"); - // repositoryBackupRestoreDirectlyOverJobExistingRepositoryRestore("db2"); - // } - // - // public void testJobRepositoryRestoreSingleDB() throws Exception - // { - // repositoryBackupRestoreDirectlyOverJobRepositoryRestore("db1"); - // repositoryBackupRestoreDirectlyOverJobRepositoryRestore("db1"); - // } - // - // public void testJobRepositoryRestoreMultiDB() throws Exception - // { - // repositoryBackupRestoreDirectlyOverJobRepositoryRestore("db2"); - // repositoryBackupRestoreDirectlyOverJobRepositoryRestore("db2"); - // } - // - // public void testJobExistingWorkspaceSameConfigRestoreSingleDB() throws Exception - // { - // workspaceBackupRestoreDirectlyOverJobExistingWorkspaceSameConfigRestore("db1"); - // workspaceBackupRestoreDirectlyOverJobExistingWorkspaceSameConfigRestore("db1"); - // } - // - // public void testJobExistingWorkspaceSameConfigRestoreMultiDB() throws Exception - // { - // workspaceBackupRestoreDirectlyOverJobExistingWorkspaceSameConfigRestore("db2"); - // workspaceBackupRestoreDirectlyOverJobExistingWorkspaceSameConfigRestore("db2"); - // } - // - // public void testJobExistingWorkspaceRestoreSingleDB() throws Exception - // { - // workspaceBackupRestoreDirectlyOverJobExistingWorkspaceRestore("db1"); - // workspaceBackupRestoreDirectlyOverJobExistingWorkspaceRestore("db1"); - // } - // - // public void testJobExistingWorkspaceRestoreMultiDB() throws Exception - // { - // workspaceBackupRestoreDirectlyOverJobExistingWorkspaceRestore("db2"); - // workspaceBackupRestoreDirectlyOverJobExistingWorkspaceRestore("db2"); - // } - // - // public void testJobWorkspaceRestoreSingleDB() throws Exception - // { - // workspaceBackupRestoreDirectlyOverJobWorkspaceRestore("db1"); - // workspaceBackupRestoreDirectlyOverJobWorkspaceRestore("db1"); - // } - // - // public void testJobWorkspaceRestoreMultiDB() throws Exception - // { - // workspaceBackupRestoreDirectlyOverJobWorkspaceRestore("db2"); - // workspaceBackupRestoreDirectlyOverJobWorkspaceRestore("db2"); - // } + public void testJobExistingRepositorySameConfigRestoreSingleDB() throws Exception + { + repositoryBackupRestoreDirectlyOverJobExistingRepositorySameConfigRestore("db3"); + repositoryBackupRestoreDirectlyOverJobExistingRepositorySameConfigRestore("db3"); + } + public void testJobExistingRepositorySameConfigRestoreMultiDB() throws Exception + { + repositoryBackupRestoreDirectlyOverJobExistingRepositorySameConfigRestore("db4"); + repositoryBackupRestoreDirectlyOverJobExistingRepositorySameConfigRestore("db4"); + } + + public void testJobExistingRepositoryRestoreSingleDB() throws Exception + { + repositoryBackupRestoreDirectlyOverJobExistingRepositoryRestore("db3"); + repositoryBackupRestoreDirectlyOverJobExistingRepositoryRestore("db3"); + } + + public void testJobExistingRepositoryRestoreMultiDB() throws Exception + { + repositoryBackupRestoreDirectlyOverJobExistingRepositoryRestore("db4"); + repositoryBackupRestoreDirectlyOverJobExistingRepositoryRestore("db4"); + } + + public void testJobRepositoryRestoreSingleDB() throws Exception + { + repositoryBackupRestoreDirectlyOverJobRepositoryRestore("db3"); + repositoryBackupRestoreDirectlyOverJobRepositoryRestore("db3"); + } + + public void testJobRepositoryRestoreMultiDB() throws Exception + { + repositoryBackupRestoreDirectlyOverJobRepositoryRestore("db4"); + repositoryBackupRestoreDirectlyOverJobRepositoryRestore("db4"); + } + + public void testJobExistingWorkspaceSameConfigRestoreSingleDB() throws Exception + { + workspaceBackupRestoreDirectlyOverJobExistingWorkspaceSameConfigRestore("db3"); + workspaceBackupRestoreDirectlyOverJobExistingWorkspaceSameConfigRestore("db3"); + } + + public void testJobExistingWorkspaceSameConfigRestoreMultiDB() throws Exception + { + workspaceBackupRestoreDirectlyOverJobExistingWorkspaceSameConfigRestore("db4"); + workspaceBackupRestoreDirectlyOverJobExistingWorkspaceSameConfigRestore("db4"); + } + + public void testJobExistingWorkspaceRestoreSingleDB() throws Exception + { + workspaceBackupRestoreDirectlyOverJobExistingWorkspaceRestore("db3"); + workspaceBackupRestoreDirectlyOverJobExistingWorkspaceRestore("db3"); + } + + public void testJobExistingWorkspaceRestoreMultiDB() throws Exception + { + workspaceBackupRestoreDirectlyOverJobExistingWorkspaceRestore("db4"); + workspaceBackupRestoreDirectlyOverJobExistingWorkspaceRestore("db4"); + } + + public void testJobWorkspaceRestoreSingleDB() throws Exception + { + workspaceBackupRestoreDirectlyOverJobWorkspaceRestore("db3"); + workspaceBackupRestoreDirectlyOverJobWorkspaceRestore("db3"); + } + + public void testJobWorkspaceRestoreMultiDB() throws Exception + { + workspaceBackupRestoreDirectlyOverJobWorkspaceRestore("db4"); + workspaceBackupRestoreDirectlyOverJobWorkspaceRestore("db4"); + } + protected void repositoryBackupRestoreDirectlyOverJobExistingRepositorySameConfigRestore(String repositoryName) throws Exception { @@ -706,7 +706,7 @@ DBCleaner repositoryDBCleaner = DBCleanService.getRepositoryDBCleaner(conn, repository.getConfiguration()); try { - if (repositoryName.equals("db1")) + if (repositoryName.equals("db3")) { // clean and rollback first repositoryDBCleaner.executeCleanScripts(); @@ -732,7 +732,7 @@ conn.close(); } - if (repositoryName.equals("db1")) + if (repositoryName.equals("db3")) { checkEmptyTables(repositoryName); } Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-db2.xml 2011-11-15 15:19:02 UTC (rev 5190) @@ -105,7 +105,7 @@ <description>working-conf</description> <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> - <property name="source-name" value="jdbcjcr" /> + <property name="source-name" value="jdbcjcr6" /> </properties-param> </init-params> </component> @@ -189,7 +189,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr</value> + <value>jdbcjcr6</value> </value-param> <value-param> <name>class-name</name> @@ -216,7 +216,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr1</value> + <value>jdbcjcr7</value> </value-param> <value-param> <name>class-name</name> @@ -243,7 +243,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr2</value> + <value>jdbcjcr8</value> </value-param> <value-param> <name>class-name</name> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mssql.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mssql.xml 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mssql.xml 2011-11-15 15:19:02 UTC (rev 5190) @@ -105,7 +105,7 @@ <description>working-conf</description> <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> - <property name="source-name" value="jdbcjcr" /> + <property name="source-name" value="jdbcjcr6" /> </properties-param> </init-params> </component> @@ -189,7 +189,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr</value> + <value>jdbcjcr6</value> </value-param> <value-param> <name>class-name</name> @@ -216,7 +216,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr1</value> + <value>jdbcjcr7</value> </value-param> <value-param> <name>class-name</name> @@ -243,7 +243,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr2</value> + <value>jdbcjcr8</value> </value-param> <value-param> <name>class-name</name> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mysql.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mysql.xml 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-mysql.xml 2011-11-15 15:19:02 UTC (rev 5190) @@ -105,7 +105,7 @@ <description>working-conf</description> <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> - <property name="source-name" value="jdbcjcr" /> + <property name="source-name" value="jdbcjcr6" /> </properties-param> </init-params> </component> @@ -189,7 +189,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr</value> + <value>jdbcjcr6</value> </value-param> <value-param> <name>class-name</name> @@ -216,7 +216,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr1</value> + <value>jdbcjcr7</value> </value-param> <value-param> <name>class-name</name> @@ -244,7 +244,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr2</value> + <value>jdbcjcr8</value> </value-param> <value-param> <name>class-name</name> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-oracle.xml 2011-11-15 15:19:02 UTC (rev 5190) @@ -105,7 +105,7 @@ <description>working-conf</description> <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> - <property name="source-name" value="jdbcjcr" /> + <property name="source-name" value="jdbcjcr6" /> </properties-param> </init-params> </component> @@ -189,7 +189,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr</value> + <value>jdbcjcr6</value> </value-param> <value-param> <name>class-name</name> @@ -216,7 +216,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr1</value> + <value>jdbcjcr7</value> </value-param> <value-param> <name>class-name</name> @@ -243,7 +243,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr2</value> + <value>jdbcjcr8</value> </value-param> <value-param> <name>class-name</name> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-pgsql.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-pgsql.xml 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-pgsql.xml 2011-11-15 15:19:02 UTC (rev 5190) @@ -105,7 +105,7 @@ <description>working-conf</description> <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> - <property name="source-name" value="jdbcjcr" /> + <property name="source-name" value="jdbcjcr6" /> </properties-param> </init-params> </component> @@ -189,7 +189,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr</value> + <value>jdbcjcr6</value> </value-param> <value-param> <name>class-name</name> @@ -217,7 +217,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr1</value> + <value>jdbcjcr7</value> </value-param> <value-param> <name>class-name</name> @@ -245,7 +245,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr2</value> + <value>jdbcjcr8</value> </value-param> <value-param> <name>class-name</name> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-sybase.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-sybase.xml 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup-sybase.xml 2011-11-15 15:19:02 UTC (rev 5190) @@ -105,7 +105,7 @@ <description>working-conf</description> <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> - <property name="source-name" value="jdbcjcr" /> + <property name="source-name" value="jdbcjcr6" /> </properties-param> </init-params> </component> @@ -189,7 +189,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr</value> + <value>jdbcjcr6</value> </value-param> <value-param> <name>class-name</name> @@ -216,7 +216,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr1</value> + <value>jdbcjcr7</value> </value-param> <value-param> <name>class-name</name> @@ -243,7 +243,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr2</value> + <value>jdbcjcr8</value> </value-param> <value-param> <name>class-name</name> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup.xml 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration-backup.xml 2011-11-15 15:19:02 UTC (rev 5190) @@ -105,7 +105,7 @@ <description>working-conf</description> <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> - <property name="source-name" value="jdbcjcr" /> + <property name="source-name" value="jdbcjcr6" /> </properties-param> </init-params> </component> @@ -189,7 +189,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr</value> + <value>jdbcjcr6</value> </value-param> <value-param> <name>class-name</name> @@ -203,7 +203,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db1" /> + <property name="url" value="jdbc:hsqldb:file:target/temp/data/db3" /> <property name="username" value="sa" /> <property name="password" value="" /> </properties-param> @@ -216,7 +216,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr1</value> + <value>jdbcjcr7</value> </value-param> <value-param> <name>class-name</name> @@ -230,7 +230,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db2ws" /> + <property name="url" value="jdbc:hsqldb:file:target/temp/data/db4ws" /> <property name="username" value="sa" /> <property name="password" value="" /> </properties-param> @@ -243,7 +243,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr2</value> + <value>jdbcjcr8</value> </value-param> <value-param> <name>class-name</name> @@ -257,7 +257,7 @@ <name>ref-addresses</name> <description>ref-addresses</description> <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/db2ws2" /> + <property name="url" value="jdbc:hsqldb:file:target/temp/data/db4ws2" /> <property name="username" value="sa" /> <property name="password" value="" /> </properties-param> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2011-11-15 15:19:02 UTC (rev 5190) @@ -723,87 +723,6 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr_backup_only_use_1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_backup_only_use_1" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr_backup_only_use_2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_backup_only_use_2" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr_workspace_restore</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_workspace_restore" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> <value>jdbcjcr3</value> </value-param> <value-param> @@ -878,6 +797,7 @@ </properties-param> </init-params> </component-plugin> + <component-plugin> <name>bind.datasource</name> <set-method>addPlugin</set-method> @@ -959,6 +879,7 @@ </properties-param> </init-params> </component-plugin> + <component-plugin> <name>bind.datasource</name> <set-method>addPlugin</set-method> @@ -966,276 +887,6 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr9</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr9" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr10</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr10" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr11</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr11" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr12</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr12" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr13</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr13" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr14</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr14" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr15</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr15" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr16</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr16" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr17</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr17" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr18</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr18" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> <value>jdbcjcr19</value> </value-param> <value-param> @@ -1263,60 +914,6 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr77</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr77" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr20</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr20" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> <value>jdbcjcr21</value> </value-param> <value-param> @@ -1344,33 +941,6 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr22</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr22" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> <value>jdbcjcr23</value> </value-param> <value-param> @@ -1506,35 +1076,6 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr28</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr28" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - - - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> <value>jdbcjcr_to_rest_repo_1</value> </value-param> <value-param> @@ -1589,33 +1130,6 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcjcr_to_repository_restore</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_to_repository_restore" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> <value>jdbcjcr_to_repository_restore_singel_db</value> </value-param> <value-param> @@ -1636,88 +1150,7 @@ </properties-param> </init-params> </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr_to_repository_restore_3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_to_repository_restore_3" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr_to_repository_restore_4</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_to_repository_restore_4" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr_to_repository_restore_5</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_to_repository_restore_5" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> + </external-component-plugins> <external-component-plugins> <target-component>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</target-component> <component-plugin> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config-backup.xml 2011-11-15 15:19:02 UTC (rev 5190) @@ -18,9 +18,9 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<repository-service default-repository="db1"> +<repository-service default-repository="db3"> <repositories> - <repository name="db1" system-workspace="ws" default-workspace="ws"> + <repository name="db3" system-workspace="ws" default-workspace="ws"> <security-domain>exo-domain</security-domain> <access-control>optional</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> @@ -28,16 +28,16 @@ <workspace name="ws"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcjcr" /> + <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/db1ws" /> + <property name="swap-directory" value="target/temp/swap/db3ws" /> </properties> <value-storages> <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="target/temp/values/db1ws" /> + <property name="path" value="target/temp/values/db3ws" /> </properties> <filters> <filter property-type="Binary" /> @@ -58,7 +58,7 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="target/temp/jcrlucenedb/db1ws" /> + <property name="index-dir" value="target/temp/jcrlucenedb/db3ws" /> </properties> </query-handler> <lock-manager> @@ -69,16 +69,16 @@ <workspace name="ws1"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcjcr" /> + <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/db1ws1" /> + <property name="swap-directory" value="target/temp/swap/db3ws1" /> </properties> <value-storages> <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="target/temp/values/db1ws1" /> + <property name="path" value="target/temp/values/db3ws1" /> </properties> <filters> <filter property-type="Binary" /> @@ -99,7 +99,7 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="target/temp/jcrlucenedb/db1ws1" /> + <property name="index-dir" value="target/temp/jcrlucenedb/db3ws1" /> </properties> </query-handler> <lock-manager> @@ -108,8 +108,8 @@ </workspace> </workspaces> </repository> - - <repository name="db2" system-workspace="ws" default-workspace="ws"> + + <repository name="db4" system-workspace="ws" default-workspace="ws"> <security-domain>exo-domain</security-domain> <access-control>optional</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> @@ -117,16 +117,16 @@ <workspace name="ws"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcjcr1" /> + <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/db2ws" /> + <property name="swap-directory" value="target/temp/swap/db4ws" /> </properties> <value-storages> <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="target/temp/values/db2ws" /> + <property name="path" value="target/temp/values/db4ws" /> </properties> <filters> <filter property-type="Binary" /> @@ -147,7 +147,7 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="target/temp/jcrlucenedb/db2ws" /> + <property name="index-dir" value="target/temp/jcrlucenedb/db4ws" /> </properties> </query-handler> <lock-manager> @@ -158,16 +158,16 @@ <workspace name="ws1"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcjcr2" /> + <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/db2ws1" /> + <property name="swap-directory" value="target/temp/swap/db4ws1" /> </properties> <value-storages> <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="target/temp/values/db2ws1" /> + <property name="path" value="target/temp/values/db4ws1" /> </properties> <filters> <filter property-type="Binary" /> @@ -188,7 +188,7 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="target/temp/jcrlucenedb/db2ws1" /> + <property name="index-dir" value="target/temp/jcrlucenedb/db4ws1" /> </properties> </query-handler> <lock-manager> @@ -196,6 +196,6 @@ </lock-manager> </workspace> </workspaces> - </repository> + </repository> </repositories> </repository-service> Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2011-11-15 14:41:05 UTC (rev 5189) +++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2011-11-15 15:19:02 UTC (rev 5190) @@ -207,92 +207,185 @@ </workspace> </workspaces> </repository> + <repository name="db3" system-workspace="ws" default-workspace="ws"> <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="ws"> - <!-- for system storage --> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcjcr77" /> - <property name="dialect" value="auto" /> + <property name="source-name" value="jdbcjcr6" /> <property name="multi-db" value="false" /> - <property name="update-storage" value="true" /> + <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db3_ws" /> + <property name="swap-directory" value="target/temp/swap/db3ws" /> </properties> + <value-storages> + <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/db3ws" /> + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> + </value-storages> </container> - <cache enabled="true"> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> <properties> - <property name="max-size" value="5k" /> + <property name="root-nodetype" value="nt:unstructured" /> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="10k" /> <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="target/temp/index/db3_ws" /> + <property name="index-dir" value="target/temp/jcrlucenedb/db3ws" /> </properties> </query-handler> + <lock-manager> + <time-out>54000</time-out> + </lock-manager> </workspace> + + <workspace name="ws1"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <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> + <value-storages> + <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/db3ws1" /> + </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" /> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="10k" /> + <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="target/temp/jcrlucenedb/db3ws1" /> + </properties> + </query-handler> + <lock-manager> + <time-out>54000</time-out> + </lock-manager> + </workspace> </workspaces> </repository> + <repository name="db4" system-workspace="ws" default-workspace="ws"> <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="ws"> - <!-- for system storage --> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcjcr20" /> - <property name="dialect" value="auto" /> + <property name="source-name" value="jdbcjcr7" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> + <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db4_ws" /> + <property name="swap-directory" value="target/temp/swap/db4ws" /> </properties> + <value-storages> + <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/db4ws" /> + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> + </value-storages> </container> - <cache enabled="true"> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> <properties> - <property name="max-size" value="5k" /> + <property name="root-nodetype" value="nt:unstructured" /> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="10k" /> <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="target/temp/index/db4_ws" /> + <property name="index-dir" value="target/temp/jcrlucenedb/db4ws" /> </properties> </query-handler> + <lock-manager> + <time-out>15m</time-out> + </lock-manager> </workspace> + <workspace name="ws1"> - <!-- for system storage --> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcjcr22" /> - <property name="dialect" value="auto" /> + <property name="source-name" value="jdbcjcr8" /> <property name="multi-db" value="true" /> - <property name="update-storage" value="true" /> + <property name="update-storage" value="false" /> <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/db4_ws1" /> + <property name="swap-directory" value="target/temp/swap/db4ws1" /> </properties> + <value-storages> + <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/db4ws1" /> + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> + </value-storages> </container> - <cache enabled="true"> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> <properties> - <property name="max-size" value="5k" /> + <property name="root-nodetype" value="nt:unstructured" /> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="10k" /> <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="target/temp/index/db4_ws1" /> + <property name="index-dir" value="target/temp/jcrlucenedb/db4ws1" /> </properties> </query-handler> + <lock-manager> + <time-out>15m</time-out> + </lock-manager> </workspace> </workspaces> - </repository> + </repository> + <repository name="db5" system-workspace="ws" default-workspace="ws"> <security-domain>exo-domain</security-domain> <access-control>optional</access-control> @@ -425,6 +518,7 @@ </workspace> </workspaces> </repository> + <repository name="db7" system-workspace="ws" default-workspace="ws"> <security-domain>exo-domain</security-domain> <access-control>optional</access-control> @@ -499,81 +593,5 @@ </workspace> </workspaces> </repository> - <repository name="db8" system-workspace="ws" default-workspace="ws"> - <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="ws"> - <!-- for system storage --> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr_backup_only_use_1" /> - <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/db8_ws" /> - </properties> - <value-storages> - <value-storage id="draft" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/db8_ws" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <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="target/temp/index/db8_ws" /> - </properties> - </query-handler> - </workspace> - <workspace name="ws1"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr_backup_only_use_2" /> - <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/db8_ws1" /> - </properties> - <value-storages> - <value-storage id="draft" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/db8_ws1" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <cache enabled="true"> - <properties> - <property name="max-size" value="5k" /> - <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="target/temp/index/db8_ws1" /> - </properties> - </query-handler> - </workspace> - </workspaces> - </repository> - - </repositories> </repository-service>