November 2011 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r5199 - in jcr/branches/1.12.x/patch/1.12.11-GA: JCR-1689 and 1 other directory.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2011-11-17 09:13:11 -0500 (Thu, 17 Nov 2011) New Revision: 5199 Added: jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1689/ jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1689/JCR-1689.patch Log: JCR-1689 : Profiles for each supported DB configuration was committed in patch JCR-1689.patch Added: jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1689/JCR-1689.patch =================================================================== --- jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1689/JCR-1689.patch (rev 0) +++ jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1689/JCR-1689.patch 2011-11-17 14:13:11 UTC (rev 5199) @@ -0,0 +1,2393 @@ +Index: exo.jcr.component.core/src/test/resources/conf/standalone/default.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/default.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/default.properties (revision 0) +@@ -0,0 +1,52 @@ ++# Global Properties ++all.driverClassName=org.hsqldb.jdbcDriver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc ++jdbcjcr.username=sa ++jdbcjcr.password= ++ ++# Properties for jdbcjcr1 ++jdbcjcr1.url=jdbc:hsqldb:file:target/temp/data/jcr ++jdbcjcr1.username=sa ++jdbcjcr1.password= ++ ++# Properties for jdbcjcr2 ++jdbcjcr2.url=jdbc:hsqldb:file:target/temp/data/jcr2 ++jdbcjcr2.username=sa ++jdbcjcr2.password= ++ ++# Properties for jdbcjcr3 ++jdbcjcr3.url=jdbc:hsqldb:file:target/temp/data/jcr3 ++jdbcjcr3.username=sa ++jdbcjcr3.password= ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:hsqldb:file:target/temp/data/portaldb2 ++jdbcjcrdb2.username=sa ++jdbcjcrdb2.password= ++ ++# Properties for jdbcjcr1db2 ++jdbcjcr1db2.url=jdbc:hsqldb:file:target/temp/data/jcrdb2 ++jdbcjcr1db2.username=sa ++jdbcjcr1db2.password= ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:hsqldb:file:target/temp/data/portaltck ++jdbcjcrtck.username=sa ++jdbcjcrtck.password= ++ ++# Properties for jdbcjcr1tck ++jdbcjcr1tck.url=jdbc:hsqldb:file:target/temp/data/jcrtck ++jdbcjcr1tck.username=sa ++jdbcjcr1tck.password= ++ ++# Properties for jdbcjcr2tck ++jdbcjcr2tck.url=jdbc:hsqldb:file:target/temp/data/jcr2tck ++jdbcjcr2tck.username=sa ++jdbcjcr2tck.password= ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:hsqldb:file:target/temp/data/testdbcleaner ++testdbcleaner.username=sa ++testdbcleaner.password= +Index: exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml (revision 5186) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml (working copy) +@@ -47,6 +47,7 @@ + <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> + <property name="jdbc-source-name" value="jdbcjcr" /> + <property name="jdbc-dialect" value="auto" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" /> +@@ -65,7 +66,7 @@ + <property name="restore-path" value="./src/test/resources/import-export/restore_db1_ws1.xml" /> + </properties> + </initializer --> +- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +@@ -108,6 +109,7 @@ + <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws1" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" /> +@@ -115,7 +117,7 @@ + </value-storage> + </value-storages> + </container> +- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +@@ -161,6 +163,7 @@ + <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws2" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" /> +@@ -168,7 +171,7 @@ + </value-storage> + </value-storages> + </container> +- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +@@ -199,91 +202,81 @@ + </properties> + </lock-manager> + </workspace> +- ++ + <workspace name="ws3"> +-  +- <container +- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> +- <properties> +- <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> +- <value-storages> +-  +- <value-storage id="ws3_big" +- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> +- <properties> +- <property name="path" value="target/temp/values/ws3_big" /> +- </properties> +- <filters> +- <filter property-type="Binary" min-value-size="1024K" /> +- </filters> +- </value-storage> +- <value-storage id="ws3" +- class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> +- <properties> +- <property name="path" value="target/temp/values/ws3" /> +- <property name="digest-algo" value="MD5" /> +- <property name="vcas-type" +- value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> +- <property name="jdbc-source-name" value="jdbcjcr" /> +- </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.jbosscache.JBossCacheWorkspaceStorageCache"> +- <properties> +- <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> +- </properties> +- </cache> +- <query-handler +- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> +- <properties> +- <property name="index-dir" value="target/temp/index/db1/ws3" /> +- <property name="synonymprovider-class" +- value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> +- <property name="synonymprovider-config-path" value="../../synonyms.properties" /> +- <property name="support-highlighting" value="true" /> +- <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> +- <property name="query-class" +- value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> +- <property name="spellchecker-class" +- value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> +- </properties> +- </query-handler> +- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> +- <properties> +- <property name="time-out" value="15m" /> +- <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lock.xml" /> +- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3" /> +- <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> +- <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> +- <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1_ws3_pk" /> +- <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> +- <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> +- <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> +- <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" /> +- </properties> +- </lock-manager> +- +- </workspace> ++  ++ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> ++ <properties> ++ <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> ++ <value-storages> ++  ++ <value-storage id="ws3_big" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> ++ <properties> ++ <property name="path" value="target/temp/values/ws3_big" /> ++ <property name="enabled" value="${value-storage-enabled}" /> ++ </properties> ++ <filters> ++ <filter property-type="Binary" min-value-size="1024K" /> ++ </filters> ++ </value-storage> ++ <value-storage id="ws3" class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> ++ <properties> ++ <property name="path" value="target/temp/values/ws3" /> ++ <property name="digest-algo" value="MD5" /> ++ <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> ++ <property name="jdbc-source-name" value="jdbcjcr" /> ++ <property name="enabled" value="${value-storage-enabled}" /> ++ </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="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <properties> ++ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> ++ </properties> ++ </cache> ++ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> ++ <properties> ++ <property name="index-dir" value="target/temp/index/db1/ws3" /> ++ <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> ++ <property name="synonymprovider-config-path" value="../../synonyms.properties" /> ++ <property name="support-highlighting" value="true" /> ++ <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> ++ <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> ++ <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> ++ </properties> ++ </query-handler> ++ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> ++ <properties> ++ <property name="time-out" value="15m" /> ++ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lock.xml" /> ++ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3" /> ++ <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> ++ <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> ++ <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1_ws3_pk" /> ++ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> ++ <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> ++ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> ++ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" /> ++ </properties> ++ </lock-manager> ++ </workspace> + </workspaces> + </repository> + +@@ -309,6 +302,7 @@ + <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/wsdb2" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -322,7 +316,7 @@ + <property name="root-permissions" value="*:/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.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> +@@ -364,6 +358,7 @@ + <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws1db2" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -377,7 +372,7 @@ + <property name="root-permissions" value="any read;any add_node;any set_property;any remove" /> + </properties> + </initializer> +- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> +@@ -429,6 +424,7 @@ + <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/wstck" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -442,7 +438,7 @@ + <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.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +@@ -489,6 +485,7 @@ + <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws1tck" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -502,7 +499,7 @@ + <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.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +@@ -548,6 +545,7 @@ + <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws2tck" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -561,7 +559,7 @@ + <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.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +Index: exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml (revision 5186) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml (working copy) +@@ -247,10 +247,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr.url}"/> ++ <property name="username" value="${jdbcjcr.username}"/> ++ <property name="password" value="${jdbcjcr.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -274,10 +274,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr1.url}"/> ++ <property name="username" value="${jdbcjcr1.username}"/> ++ <property name="password" value="${jdbcjcr1.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -301,10 +301,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr2.url}"/> ++ <property name="username" value="${jdbcjcr2.username}"/> ++ <property name="password" value="${jdbcjcr2.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -328,10 +328,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr3"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr3.url}"/> ++ <property name="username" value="${jdbcjcr3.username}"/> ++ <property name="password" value="${jdbcjcr3.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -382,10 +382,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaldb2"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcrdb2.url}"/> ++ <property name="username" value="${jdbcjcrdb2.username}"/> ++ <property name="password" value="${jdbcjcrdb2.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -409,10 +409,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrdb2"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr1db2.url}"/> ++ <property name="username" value="${jdbcjcr1db2.username}"/> ++ <property name="password" value="${jdbcjcr1db2.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -436,10 +436,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaltck"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcrtck.url}"/> ++ <property name="username" value="${jdbcjcrtck.username}"/> ++ <property name="password" value="${jdbcjcrtck.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -463,10 +463,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtck"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr1tck.url}"/> ++ <property name="username" value="${jdbcjcr1tck.username}"/> ++ <property name="password" value="${jdbcjcr1tck.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -490,10 +490,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2tck"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr2tck.url}"/> ++ <property name="username" value="${jdbcjcr2tck.username}"/> ++ <property name="password" value="${jdbcjcr2tck.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -598,10 +598,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/testdbcleaner"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${testdbcleaner.url}"/> ++ <property name="username" value="${testdbcleaner.username}"/> ++ <property name="password" value="${testdbcleaner.password}"/> + </properties-param> + </init-params> + </component-plugin> +Index: exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml (revision 5186) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml (working copy) +@@ -33,6 +33,7 @@ + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" /> +@@ -45,7 +46,7 @@ + <property name="root-nodetype" value="nt:unstructured" /> + </properties> + </initializer> +- <cache enabled="true" ++ <cache enabled="${cache-enabled}" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="test-jbosscache-data.xml" /> +@@ -99,6 +100,7 @@ + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws1" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" /> +@@ -106,7 +108,7 @@ + </value-storage> + </value-storages> + </container> +- <cache enabled="true" ++ <cache enabled="${cache-enabled}" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="test-jbosscache-data.xml" /> +@@ -170,6 +172,7 @@ + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws2" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" /> +@@ -177,7 +180,7 @@ + </value-storage> + </value-storages> + </container> +- <cache enabled="true" ++ <cache enabled="${cache-enabled}" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="test-jbosscache-data.xml" /> +@@ -242,6 +245,7 @@ + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws3_big" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="1024K" /> +@@ -255,6 +259,7 @@ + <property name="vcas-type" + value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> + <property name="jdbc-source-name" value="jdbcjcr" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" /> +@@ -262,7 +267,7 @@ + </value-storage> + </value-storages> + </container> +- <cache enabled="true" ++ <cache enabled="${cache-enabled}" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="test-jbosscache-data.xml" /> +@@ -336,6 +341,7 @@ + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/wsdb2" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -349,7 +355,7 @@ + <property name="root-permissions" value="*:/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.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="test-jbosscache-data.xml" /> + <property name="jgroups-configuration" value="udp-mux.xml" /> +@@ -413,7 +419,7 @@ + <property name="root-permissions" value="any read;any add_node;any set_property;any remove" /> + </properties> + </initializer> +- <cache enabled="true" ++ <cache enabled="${cache-enabled}" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="test-jbosscache-data.xml" /> +@@ -489,7 +495,7 @@ + value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> + </properties> + </initializer> +- <cache enabled="true" ++ <cache enabled="${cache-enabled}" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="test-jbosscache-data.xml" /> +@@ -567,7 +573,7 @@ + value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> + </properties> + </initializer> +- <cache enabled="true" ++ <cache enabled="${cache-enabled}" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="test-jbosscache-data.xml" /> +@@ -643,7 +649,7 @@ + value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> + </properties> + </initializer> +- <cache enabled="true" ++ <cache enabled="${cache-enabled}" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="test-jbosscache-data.xml" /> +Index: exo.jcr.component.core/src/test/resources/conf/standalone/pgsql.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/pgsql.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/pgsql.properties (revision 0) +@@ -0,0 +1,52 @@ ++# Global Properties ++all.driverClassName=org.postgresql.Driver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:postgresql://localhost:5433/db1_ws ++jdbcjcr.username=root ++jdbcjcr.password=eXoAdmin ++ ++# Properties for jdbcjcr1 ++jdbcjcr1.url=jdbc:postgresql://localhost:5433/db1_ws1 ++jdbcjcr1.username=root ++jdbcjcr1.password=eXoAdmin ++ ++# Properties for jdbcjcr2 ++jdbcjcr2.url=jdbc:postgresql://localhost:5433/db1_ws2 ++jdbcjcr2.username=root ++jdbcjcr2.password=eXoAdmin ++ ++# Properties for jdbcjcr3 ++jdbcjcr3.url=jdbc:postgresql://localhost:5433/db1_ws3 ++jdbcjcr3.username=root ++jdbcjcr3.password=eXoAdmin ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:postgresql://localhost:5433/db2_ws ++jdbcjcrdb2.username=root ++jdbcjcrdb2.password=eXoAdmin ++ ++# Properties for jdbcjcr1db2 ++jdbcjcr1db2.url=jdbc:postgresql://localhost:5433/db2_ws1 ++jdbcjcr1db2.username=root ++jdbcjcr1db2.password=eXoAdmin ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:postgresql://localhost:5433/db1tck_ws ++jdbcjcrtck.username=root ++jdbcjcrtck.password=eXoAdmin ++ ++# Properties for jdbcjcr1tck ++jdbcjcr1tck.url=jdbc:postgresql://localhost:5433/db1tck_ws1 ++jdbcjcr1tck.username=root ++jdbcjcr1tck.password=eXoAdmin ++ ++# Properties for jdbcjcr2tck ++jdbcjcr2tck.url=jdbc:postgresql://localhost:5433/db1tck_ws2 ++jdbcjcr2tck.username=root ++jdbcjcr2tck.password=eXoAdmin ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:postgresql://localhost:5433/testdbcleaner_sjdbc ++testdbcleaner.username=root ++testdbcleaner.password=eXoAdmin +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/sybase.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/sybase.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/sybase.properties (revision 0) +@@ -0,0 +1,52 @@ ++# Global Properties ++all.driverClassName=com.sybase.jdbc4.jdbc.SybDriver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:sybase:Tds:localhost:5003/db1_ws ++jdbcjcr.username=sa ++jdbcjcr.password= ++ ++# Properties for jdbcjcr1 ++jdbcjcr1.url=jdbc:sybase:Tds:localhost:5003/db1_ws1 ++jdbcjcr1.username=sa ++jdbcjcr1.password= ++ ++# Properties for jdbcjcr2 ++jdbcjcr2.url=jdbc:sybase:Tds:localhost:5003/db1_ws2 ++jdbcjcr2.username=sa ++jdbcjcr2.password= ++ ++# Properties for jdbcjcr3 ++jdbcjcr3.url=jdbc:sybase:Tds:localhost:5003/db1_ws3 ++jdbcjcr3.username=sa ++jdbcjcr3.password= ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:sybase:Tds:localhost:5003/db2_ws ++jdbcjcrdb2.username=sa ++jdbcjcrdb2.password= ++ ++# Properties for jdbcjcr1db2 ++jdbcjcr1db2.url=jdbc:sybase:Tds:localhost:5003/db2_ws1 ++jdbcjcr1db2.username=sa ++jdbcjcr1db2.password= ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:sybase:Tds:localhost:5003/db1tck_ws ++jdbcjcrtck.username=sa ++jdbcjcrtck.password= ++ ++# Properties for jdbcjcr1tck ++jdbcjcr1tck.url=jdbc:sybase:Tds:localhost:5003/db1tck_ws1 ++jdbcjcr1tck.username=sa ++jdbcjcr1tck.password= ++ ++# Properties for jdbcjcr2tck ++jdbcjcr2tck.url=jdbc:sybase:Tds:localhost:5003/db1tck_ws2 ++jdbcjcr2tck.username=sa ++jdbcjcr2tck.password= ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:sybase:Tds:localhost:5003/testdbcleaner ++testdbcleaner.username=sa ++testdbcleaner.password= +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/oracle-sjdbc.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/oracle-sjdbc.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/oracle-sjdbc.properties (revision 0) +@@ -0,0 +1,22 @@ ++# Global Properties ++all.driverClassName=oracle.jdbc.OracleDriver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcr.username=exoperf ++jdbcjcr.password=exo12321 ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcrdb2.username=exoperf1 ++jdbcjcrdb2.password=exo12321 ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcrtck.username=exoperf2 ++jdbcjcrtck.password=exo12321 ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++testdbcleaner.username=exoperf3 ++testdbcleaner.password=exo12321 +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/mysql-sjdbc.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/mysql-sjdbc.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/mysql-sjdbc.properties (revision 0) +@@ -0,0 +1,22 @@ ++# Global Properties ++all.driverClassName=com.mysql.jdbc.Driver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:mysql://localhost/db1 ++jdbcjcr.username=root ++jdbcjcr.password=eXoAdmin ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:mysql://localhost/db2 ++jdbcjcrdb2.username=root ++jdbcjcrdb2.password=eXoAdmin ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:mysql://localhost/db1tck ++jdbcjcrtck.username=root ++jdbcjcrtck.password=eXoAdmin ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:mysql://localhost/testdbcleaner_sjdbc ++testdbcleaner.username=root ++testdbcleaner.password=eXoAdmin +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml (revision 5186) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml (working copy) +@@ -248,10 +248,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr.url}"/> ++ <property name="username" value="${jdbcjcr.username}"/> ++ <property name="password" value="${jdbcjcr.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -275,10 +275,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr1.url}"/> ++ <property name="username" value="${jdbcjcr1.username}"/> ++ <property name="password" value="${jdbcjcr1.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -302,10 +302,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr2.url}"/> ++ <property name="username" value="${jdbcjcr2.username}"/> ++ <property name="password" value="${jdbcjcr2.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -329,10 +329,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr3"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr3.url}"/> ++ <property name="username" value="${jdbcjcr3.username}"/> ++ <property name="password" value="${jdbcjcr3.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -383,10 +383,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaldb2"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcrdb2.url}"/> ++ <property name="username" value="${jdbcjcrdb2.username}"/> ++ <property name="password" value="${jdbcjcrdb2.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -410,10 +410,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrdb2"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr1db2.url}"/> ++ <property name="username" value="${jdbcjcr1db2.username}"/> ++ <property name="password" value="${jdbcjcr1db2.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -437,10 +437,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaltck"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcrtck.url}"/> ++ <property name="username" value="${jdbcjcrtck.username}"/> ++ <property name="password" value="${jdbcjcrtck.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -464,10 +464,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtck"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr1tck.url}"/> ++ <property name="username" value="${jdbcjcr1tck.username}"/> ++ <property name="password" value="${jdbcjcr1tck.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -491,10 +491,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2tck"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr2tck.url}"/> ++ <property name="username" value="${jdbcjcr2tck.username}"/> ++ <property name="password" value="${jdbcjcr2tck.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -599,10 +599,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/testdbcleaner"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${testdbcleaner.url}"/> ++ <property name="username" value="${testdbcleaner.username}"/> ++ <property name="password" value="${testdbcleaner.password}"/> + </properties-param> + </init-params> + </component-plugin> +Index: exo.jcr.component.core/src/test/resources/conf/standalone/db2-sjdbc.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/db2-sjdbc.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/db2-sjdbc.properties (revision 0) +@@ -0,0 +1,22 @@ ++# Global Properties ++all.driverClassName=com.ibm.db2.jcc.DB2Driver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1 ++jdbcjcr.username=db2inst1 ++jdbcjcr.password=eXoAdmin ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2 ++jdbcjcrdb2.username=db2inst1 ++jdbcjcrdb2.password=eXoAdmin ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1tck ++jdbcjcrtck.username=db2inst1 ++jdbcjcrtck.password=eXoAdmin ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbclns ++testdbcleaner.username=db2inst1 ++testdbcleaner.password=eXoAdmin +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/mssql.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/mssql.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/mssql.properties (revision 0) +@@ -0,0 +1,52 @@ ++# Global Properties ++all.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver" ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:sqlserver://localhost:1433;databaseName=db1_ws; ++jdbcjcr.username=tester ++jdbcjcr.password=tester ++ ++# Properties for jdbcjcr1 ++jdbcjcr1.url=jdbc:sqlserver://localhost:1433;databaseName=db1_ws1; ++jdbcjcr1.username=tester ++jdbcjcr1.password=tester ++ ++# Properties for jdbcjcr2 ++jdbcjcr2.url=jdbc:sqlserver://localhost:1433;databaseName=db1_ws2; ++jdbcjcr2.username=tester ++jdbcjcr2.password=tester ++ ++# Properties for jdbcjcr3 ++jdbcjcr3.url=jdbc:sqlserver://localhost:1433;databaseName=db1_ws3; ++jdbcjcr3.username=tester ++jdbcjcr3.password=tester ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:sqlserver://localhost:1433;databaseName=db2_ws; ++jdbcjcrdb2.username=tester ++jdbcjcrdb2.password=tester ++ ++# Properties for jdbcjcr1db2 ++jdbcjcr1db2.url=jdbc:sqlserver://localhost:1433;databaseName=db2_ws1; ++jdbcjcr1db2.username=tester ++jdbcjcr1db2.password=tester ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:sqlserver://localhost:1433;databaseName=db1tck_ws; ++jdbcjcrtck.username=tester ++jdbcjcrtck.password=tester ++ ++# Properties for jdbcjcr1tck ++jdbcjcr1tck.url=jdbc:sqlserver://localhost:1433;databaseName=db1tck_ws1; ++jdbcjcr1tck.username=tester ++jdbcjcr1tck.password=tester ++ ++# Properties for jdbcjcr2tck ++jdbcjcr2tck.url=jdbc:sqlserver://localhost:1433;databaseName=db1tck_ws2; ++jdbcjcr2tck.username=tester ++jdbcjcr2tck.password=tester ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:sqlserver://localhost:1433;databaseName=testdbcleaner; ++testdbcleaner.username=tester ++testdbcleaner.password=tester +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml (revision 5186) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml (working copy) +@@ -46,7 +46,8 @@ + <property name="digest-algo" value="MD5" /> + <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> + <property name="jdbc-source-name" value="jdbcjcr" /> +- <property name="jdbc-dialect" value="auto" /> ++ <property name="jdbc-dialect" value="auto" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" /> +@@ -65,7 +66,7 @@ + <property name="restore-path" value="./src/test/resources/import-export/restore_db1_ws1.xml" /> + </properties> + </initializer --> +- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +@@ -107,7 +108,8 @@ + <value-storages> + <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> +- <property name="path" value="target/temp/values/ws1" /> ++ <property name="path" value="target/temp/values/ws1" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" /> +@@ -115,7 +117,7 @@ + </value-storage> + </value-storages> + </container> +- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +@@ -160,7 +162,8 @@ + <value-storages> + <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> +- <property name="path" value="target/temp/values/ws2" /> ++ <property name="path" value="target/temp/values/ws2" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" /> +@@ -168,7 +171,7 @@ + </value-storage> + </value-storages> + </container> +- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +@@ -199,91 +202,81 @@ + </properties> + </lock-manager> + </workspace> +- +- <workspace name="ws3"> +-  +- <container +- class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> +- <properties> +- <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> +- <value-storages> +-  +- <value-storage id="ws3_big" +- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> +- <properties> +- <property name="path" value="target/temp/values/ws3_big" /> +- </properties> +- <filters> +- <filter property-type="Binary" min-value-size="1024K" /> +- </filters> +- </value-storage> +- <value-storage id="ws3" +- class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> +- <properties> +- <property name="path" value="target/temp/values/ws3" /> +- <property name="digest-algo" value="MD5" /> +- <property name="vcas-type" +- value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> +- <property name="jdbc-source-name" value="jdbcjcr" /> +- </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.jbosscache.JBossCacheWorkspaceStorageCache"> +- <properties> +- <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> +- </properties> +- </cache> +- <query-handler +- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> +- <properties> +- <property name="index-dir" value="target/temp/index/db1/ws3" /> +- <property name="synonymprovider-class" +- value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> +- <property name="synonymprovider-config-path" value="../../synonyms.properties" /> +- <property name="support-highlighting" value="true" /> +- <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> +- <property name="query-class" +- value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> +- <property name="spellchecker-class" +- value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> +- </properties> +- </query-handler> +- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> +- <properties> +- <property name="time-out" value="15m" /> +- <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lock.xml" /> +- <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3" /> +- <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> +- <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> +- <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1_ws3_pk" /> +- <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> +- <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> +- <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> +- <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr3" /> +- </properties> +- </lock-manager> + +- </workspace> ++ <workspace name="ws3"> ++  ++ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> ++ <properties> ++ <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> ++ <value-storages> ++  ++ <value-storage id="ws3_big" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> ++ <properties> ++ <property name="path" value="target/temp/values/ws3_big" /> ++ <property name="enabled" value="${value-storage-enabled}" /> ++ </properties> ++ <filters> ++ <filter property-type="Binary" min-value-size="1024K" /> ++ </filters> ++ </value-storage> ++ <value-storage id="ws3" class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> ++ <properties> ++ <property name="path" value="target/temp/values/ws3" /> ++ <property name="digest-algo" value="MD5" /> ++ <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> ++ <property name="jdbc-source-name" value="jdbcjcr" /> ++ <property name="enabled" value="${value-storage-enabled}" /> ++ </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="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <properties> ++ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> ++ </properties> ++ </cache> ++ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> ++ <properties> ++ <property name="index-dir" value="target/temp/index/db1/ws3" /> ++ <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> ++ <property name="synonymprovider-config-path" value="../../synonyms.properties" /> ++ <property name="support-highlighting" value="true" /> ++ <property name="indexing-configuration-path" value="../../indexing-configuration.xml" /> ++ <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> ++ <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> ++ </properties> ++ </query-handler> ++ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> ++ <properties> ++ <property name="time-out" value="15m" /> ++ <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-lock.xml" /> ++ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3" /> ++ <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> ++ <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> ++ <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_db1_ws3_pk" /> ++ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> ++ <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> ++ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> ++ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr3" /> ++ </properties> ++ </lock-manager> ++ </workspace> + </workspaces> + </repository> + +@@ -308,7 +301,8 @@ + <value-storages> + <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> +- <property name="path" value="target/temp/values/wsdb2" /> ++ <property name="path" value="target/temp/values/wsdb2" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -322,7 +316,7 @@ + <property name="root-permissions" value="*:/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.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> +@@ -363,7 +357,8 @@ + <value-storages> + <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> +- <property name="path" value="target/temp/values/ws1db2" /> ++ <property name="path" value="target/temp/values/ws1db2" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -377,7 +372,7 @@ + <property name="root-permissions" value="any read;any add_node;any set_property;any remove" /> + </properties> + </initializer> +- <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> +@@ -429,7 +424,8 @@ + <value-storages> + <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> +- <property name="path" value="target/temp/values/wstck" /> ++ <property name="path" value="target/temp/values/wstck" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -443,7 +439,7 @@ + <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.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +@@ -489,7 +485,8 @@ + <value-storages> + <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> +- <property name="path" value="target/temp/values/ws1tck" /> ++ <property name="path" value="target/temp/values/ws1tck" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -503,7 +500,7 @@ + <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.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +@@ -548,7 +545,8 @@ + <value-storages> + <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> +- <property name="path" value="target/temp/values/ws2tck" /> ++ <property name="path" value="target/temp/values/ws2tck" /> ++ <property name="enabled" value="${value-storage-enabled}" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="100K" /> +@@ -562,7 +560,7 @@ + <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.jbosscache.JBossCacheWorkspaceStorageCache"> ++ <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + </properties> +Index: exo.jcr.component.core/src/test/resources/conf/standalone/mysql.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/mysql.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/mysql.properties (revision 0) +@@ -0,0 +1,52 @@ ++# Global Properties ++all.driverClassName=com.mysql.jdbc.Driver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:mysql://localhost/db1_ws ++jdbcjcr.username=root ++jdbcjcr.password=eXoAdmin ++ ++# Properties for jdbcjcr1 ++jdbcjcr1.url=jdbc:mysql://localhost/db1_ws1 ++jdbcjcr1.username=root ++jdbcjcr1.password=eXoAdmin ++ ++# Properties for jdbcjcr2 ++jdbcjcr2.url=jdbc:mysql://localhost/db1_ws2 ++jdbcjcr2.username=root ++jdbcjcr2.password=eXoAdmin ++ ++# Properties for jdbcjcr3 ++jdbcjcr3.url=jdbc:mysql://localhost/db1_ws3 ++jdbcjcr3.username=root ++jdbcjcr3.password=eXoAdmin ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:mysql://localhost/db2_ws ++jdbcjcrdb2.username=root ++jdbcjcrdb2.password=eXoAdmin ++ ++# Properties for jdbcjcr1db2 ++jdbcjcr1db2.url=jdbc:mysql://localhost/db2_ws1 ++jdbcjcr1db2.username=root ++jdbcjcr1db2.password=eXoAdmin ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:mysql://localhost/db1tck_ws ++jdbcjcrtck.username=root ++jdbcjcrtck.password=eXoAdmin ++ ++# Properties for jdbcjcr1tck ++jdbcjcr1tck.url=jdbc:mysql://localhost/db1tck_ws1 ++jdbcjcr1tck.username=root ++jdbcjcr1tck.password=eXoAdmin ++ ++# Properties for jdbcjcr2tck ++jdbcjcr2tck.url=jdbc:mysql://localhost/db1tck_ws2 ++jdbcjcr2tck.username=root ++jdbcjcr2tck.password=eXoAdmin ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:mysql://localhost/testdbcleaner ++testdbcleaner.username=root ++testdbcleaner.password=eXoAdmin +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/oracle.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/oracle.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/oracle.properties (revision 0) +@@ -0,0 +1,52 @@ ++# Global Properties ++all.driverClassName=oracle.jdbc.OracleDriver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcr.username=exoperfdb1_ws ++jdbcjcr.password=exo12321 ++ ++# Properties for jdbcjcr1 ++jdbcjcr1.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcr1.username=exoperfdb1_ws1 ++jdbcjcr1.password=exo12321 ++ ++# Properties for jdbcjcr2 ++jdbcjcr2.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcr2.username=exoperfdb1_ws2 ++jdbcjcr2.password=exo12321 ++ ++# Properties for jdbcjcr3 ++jdbcjcr3.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcr3.username=exoperfdb1_ws3 ++jdbcjcr3.password=exo12321 ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcrdb2.username=exoperfdb2_ws ++jdbcjcrdb2.password=exo12321 ++ ++# Properties for jdbcjcr1db2 ++jdbcjcr1db2.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcr1db2.username=exoperfdb2_ws1 ++jdbcjcr1db2.password=exo12321 ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcrtck.username=exoperfdb1tck_ws ++jdbcjcrtck.password=exo12321 ++ ++# Properties for jdbcjcr1tck ++jdbcjcr1tck.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcr1tck.username=exoperfdb1tck_ws1 ++jdbcjcr1tck.password=exo12321 ++ ++# Properties for jdbcjcr2tck ++jdbcjcr2tck.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++jdbcjcr2tck.username=exoperfdb1tck_ws2 ++jdbcjcr2tck.password=exo12321 ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm ++testdbcleaner.username=exoperftestdbcleaner ++testdbcleaner.password=exo12321 +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/db2.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/db2.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/db2.properties (revision 0) +@@ -0,0 +1,52 @@ ++# Global Properties ++all.driverClassName=com.ibm.db2.jcc.DB2Driver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws ++jdbcjcr.username=db2inst1 ++jdbcjcr.password=eXoAdmin ++ ++# Properties for jdbcjcr1 ++jdbcjcr1.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws1 ++jdbcjcr1.username=db2inst1 ++jdbcjcr1.password=eXoAdmin ++ ++# Properties for jdbcjcr2 ++jdbcjcr2.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws2 ++jdbcjcr2.username=db2inst1 ++jdbcjcr2.password=eXoAdmin ++ ++# Properties for jdbcjcr3 ++jdbcjcr3.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws3 ++jdbcjcr3.username=db2inst1 ++jdbcjcr3.password=eXoAdmin ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2_ws ++jdbcjcrdb2.username=db2inst1 ++jdbcjcrdb2.password=eXoAdmin ++ ++# Properties for jdbcjcr1db2 ++jdbcjcr1db2.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2_ws1 ++jdbcjcr1db2.username=db2inst1 ++jdbcjcr1db2.password=eXoAdmin ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbtckws ++jdbcjcrtck.username=db2inst1 ++jdbcjcrtck.password=eXoAdmin ++ ++# Properties for jdbcjcr1tck ++jdbcjcr1tck.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbtckws1 ++jdbcjcr1tck.username=db2inst1 ++jdbcjcr1tck.password=eXoAdmin ++ ++# Properties for jdbcjcr2tck ++jdbcjcr2tck.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbtckws2 ++jdbcjcr2tck.username=db2inst1 ++jdbcjcr2tck.password=eXoAdmin ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbcln ++testdbcleaner.username=db2inst1 ++testdbcleaner.password=eXoAdmin +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/default-sjdbc.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/default-sjdbc.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/default-sjdbc.properties (revision 0) +@@ -0,0 +1,22 @@ ++# Global Properties ++all.driverClassName=org.hsqldb.jdbcDriver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc ++jdbcjcr.username=sa ++jdbcjcr.password= ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:hsqldb:file:target/temp/data/portaldb2 ++jdbcjcrdb2.username=sa ++jdbcjcrdb2.password= ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:hsqldb:file:target/temp/data/portaltck ++jdbcjcrtck.username=sa ++jdbcjcrtck.password= ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:hsqldb:file:target/temp/data/testdbcleaner ++testdbcleaner.username=sa ++testdbcleaner.password= +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/pgsql-sjdbc.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/pgsql-sjdbc.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/pgsql-sjdbc.properties (revision 0) +@@ -0,0 +1,22 @@ ++# Global Properties ++all.driverClassName=org.postgresql.Driver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:postgresql://localhost:5433/db1 ++jdbcjcr.username=root ++jdbcjcr.password=eXoAdmin ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:postgresql://localhost:5433/db2 ++jdbcjcrdb2.username=root ++jdbcjcrdb2.password=eXoAdmin ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:postgresql://localhost:5433/db1tck ++jdbcjcrtck.username=root ++jdbcjcrtck.password=eXoAdmin ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:postgresql://localhost:5433/testdbcleaner ++testdbcleaner.username=root ++testdbcleaner.password=eXoAdmin +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/sybase-sjdbc.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/sybase-sjdbc.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/sybase-sjdbc.properties (revision 0) +@@ -0,0 +1,22 @@ ++# Global Properties ++all.driverClassName=com.sybase.jdbc4.jdbc.SybDriver ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:sybase:Tds:localhost:5003/db1 ++jdbcjcr.username=sa ++jdbcjcr.password= ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:sybase:Tds:localhost:5003/db2 ++jdbcjcrdb2.username=sa ++jdbcjcrdb2.password= ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:sybase:Tds:localhost:5003/db1_tck ++jdbcjcrtck.username=sa ++jdbcjcrtck.password= ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:sybase:Tds:localhost:5003/testdbcleaner_sjdbc ++testdbcleaner.username=sa ++testdbcleaner.password= +\ No newline at end of file +Index: exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml (revision 5186) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml (working copy) +@@ -248,10 +248,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcr.url}"/> ++ <property name="username" value="${jdbcjcr.username}"/> ++ <property name="password" value="${jdbcjcr.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -302,10 +302,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaldb2"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${jdbcjcrdb2.url}"/> ++ <property name="username" value="${jdbcjcrdb2.username}"/> ++ <property name="password" value="${jdbcjcrdb2.password}"/> + </properties-param> + </init-params> + </component-plugin> +@@ -329,10 +329,10 @@ + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> +- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> +- <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaltck"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <property name="driverClassName" value="${all.driverClassName}"/>^ ++ <property name="url" value="${jdbcjcrtck.url}"/>^ ++ <property name="username" value="${jdbcjcrtck.username}"/>^ ++ <property name="password" value="${jdbcjcrtck.password}"/>^ + </properties-param> + </init-params> + </component-plugin> +@@ -436,11 +436,11 @@ + </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/testdbcleaner"/> +- <property name="username" value="sa"/> +- <property name="password" value=""/> ++ <description>ref-addresses</description> ++ <property name="driverClassName" value="${all.driverClassName}"/> ++ <property name="url" value="${testdbcleaner.url}"/> ++ <property name="username" value="${testdbcleaner.username}"/> ++ <property name="password" value="${testdbcleaner.password}"/> + </properties-param> + </init-params> + </component-plugin> +Index: exo.jcr.component.core/src/test/resources/conf/standalone/mssql-sjdbc.properties +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/mssql-sjdbc.properties (revision 0) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/mssql-sjdbc.properties (revision 0) +@@ -0,0 +1,22 @@ ++# Global Properties ++all.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver" ++ ++# Properties for jdbcjcr ++jdbcjcr.url=jdbc:sqlserver://localhost:1433;databaseName=db1; ++jdbcjcr.username=tester ++jdbcjcr.password=tester ++ ++# Properties for jdbcjcrdb2 ++jdbcjcrdb2.url=jdbc:sqlserver://localhost:1433;databaseName=db2; ++jdbcjcrdb2.username=tester ++jdbcjcrdb2.password=tester ++ ++# Properties for jdbcjcrtck ++jdbcjcrtck.url=jdbc:sqlserver://localhost:1433;databaseName=db1tck; ++jdbcjcrtck.username=tester ++jdbcjcrtck.password=tester ++ ++# Properties for testdbcleaner ++testdbcleaner.url=jdbc:sqlserver://localhost:1433;databaseName=testdbcleaner_sjdbc; ++testdbcleaner.username=tester ++testdbcleaner.password=tester +\ No newline at end of file +Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/StandaloneStoragePluginProvider.java +=================================================================== +--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/StandaloneStoragePluginProvider.java (revision 5186) ++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/StandaloneStoragePluginProvider.java (working copy) +@@ -58,6 +58,11 @@ + private static Log log = ExoLogger.getLogger("exo.jcr.component.core.StandaloneStoragePluginProvider"); + + /** ++ * Value storage enabling parameter. For interal usage only and testing purpose. ++ */ ++ private static final String VALUE_STORAGE_ENABLED_PARAM = "enabled"; ++ ++ /** + * ValueData resorces holder (Files etc). It's singleton feature. + */ + private final ValueDataResourceHolder resorcesHolder; +@@ -73,60 +78,62 @@ + if (storages != null) + for (ValueStorageEntry storageEntry : storages) + { +- +- // can be only one storage with given id +- for (ValueStoragePlugin vsp : this) ++ if (storageEntry.getParameterBoolean(VALUE_STORAGE_ENABLED_PARAM, true)) + { +- if (vsp.getId().equals(storageEntry.getId())) +- throw new RepositoryConfigurationException("Value storage with ID '" + storageEntry.getId() +- + "' already exists"); +- } ++ // can be only one storage with given id ++ for (ValueStoragePlugin vsp : this) ++ { ++ if (vsp.getId().equals(storageEntry.getId())) ++ throw new RepositoryConfigurationException("Value storage with ID '" + storageEntry.getId() ++ + "' already exists"); ++ } + +- Object o = null; +- try +- { +- o = +- Class.forName(storageEntry.getType()).getConstructor(FileCleaner.class).newInstance( +- holder.getFileCleaner()); ++ Object o = null; ++ try ++ { ++ o = ++ Class.forName(storageEntry.getType()).getConstructor(FileCleaner.class).newInstance( ++ holder.getFileCleaner()); + +- } +- catch (Exception e) +- { +- log.error("Value Storage Plugin instantiation FAILED. ", e); +- continue; +- } +- if (!(o instanceof ValueStoragePlugin)) +- { +- log.error("Not a ValueStoragePlugin object IGNORED: " + o); +- continue; +- } ++ } ++ catch (Exception e) ++ { ++ log.error("Value Storage Plugin instantiation FAILED. ", e); ++ continue; ++ } ++ if (!(o instanceof ValueStoragePlugin)) ++ { ++ log.error("Not a ValueStoragePlugin object IGNORED: " + o); ++ continue; ++ } + +- ValueStoragePlugin plugin = (ValueStoragePlugin)o; +- // init filters +- ArrayList<ValuePluginFilter> filters = new ArrayList<ValuePluginFilter>(); +- List<ValueStorageFilterEntry> filterEntries = storageEntry.getFilters(); +- for (ValueStorageFilterEntry filterEntry : filterEntries) +- { +- ValuePluginFilter filter = +- new ValuePluginFilter(PropertyType.valueFromName(filterEntry.getPropertyType()), null, null, +- filterEntry.getMinValueSize()); +- filters.add(filter); +- } ++ ValueStoragePlugin plugin = (ValueStoragePlugin)o; ++ // init filters ++ ArrayList<ValuePluginFilter> filters = new ArrayList<ValuePluginFilter>(); ++ List<ValueStorageFilterEntry> filterEntries = storageEntry.getFilters(); ++ for (ValueStorageFilterEntry filterEntry : filterEntries) ++ { ++ ValuePluginFilter filter = ++ new ValuePluginFilter(PropertyType.valueFromName(filterEntry.getPropertyType()), null, null, ++ filterEntry.getMinValueSize()); ++ filters.add(filter); ++ } + +- // init properties +- Properties props = new Properties(); +- List<SimpleParameterEntry> paramEntries = storageEntry.getParameters(); +- for (SimpleParameterEntry paramEntry : paramEntries) +- { +- props.setProperty(paramEntry.getName(), paramEntry.getValue()); +- } ++ // init properties ++ Properties props = new Properties(); ++ List<SimpleParameterEntry> paramEntries = storageEntry.getParameters(); ++ for (SimpleParameterEntry paramEntry : paramEntries) ++ { ++ props.setProperty(paramEntry.getName(), paramEntry.getValue()); ++ } + +- plugin.init(props, resorcesHolder); +- plugin.setId(storageEntry.getId()); +- plugin.setFilters(filters); ++ plugin.init(props, resorcesHolder); ++ plugin.setId(storageEntry.getId()); ++ plugin.setFilters(filters); + +- add(plugin); +- log.info("Value Storage Plugin initialized " + plugin); ++ add(plugin); ++ log.info("Value Storage Plugin initialized " + plugin); ++ } + } + } + +Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/ConfigurationFormat.java +=================================================================== +--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/ConfigurationFormat.java (revision 5186) ++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/ConfigurationFormat.java (working copy) +@@ -18,6 +18,7 @@ + */ + package org.exoplatform.services.jcr.util; + ++import org.exoplatform.container.xml.Deserializer; + import org.exoplatform.services.log.ExoLogger; + import org.exoplatform.services.log.Log; + +@@ -36,6 +37,20 @@ + + private static final Log LOG = ExoLogger.getLogger("exo.jcr.component.core.ConfigurationFormat"); + ++ public static boolean parseBoolean(String text) ++ { ++ try ++ { ++ text = Deserializer.resolveNClean(text); ++ return Boolean.valueOf(text).booleanValue(); ++ } ++ catch (Throwable e) ++ { ++ LOG.warn("Unparseable boolean '" + text + "'.", e); ++ return false; ++ } ++ } ++ + public static int parseInt(String text) + { + try +Index: exo.jcr.component.core/src/main/resources/binding.xml +=================================================================== +--- exo.jcr.component.core/src/main/resources/binding.xml (revision 5186) ++++ exo.jcr.component.core/src/main/resources/binding.xml (working copy) +@@ -1,6 +1,8 @@ + <binding> +  + <format type="java.lang.String" deserializer="org.exoplatform.container.xml.Deserializer.resolveString"/> ++  ++ <format type="boolean" deserializer="org.exoplatform.services.jcr.util.ConfigurationFormat.parseBoolean"/> + + <mapping name="repository-service" class="org.exoplatform.services.jcr.config.RepositoryServiceConfiguration"> + <value name="default-repository" field="defaultRepositoryName" style="attribute" /> +Index: exo.jcr.component.core/pom.xml +=================================================================== +--- exo.jcr.component.core/pom.xml (revision 5186) ++++ exo.jcr.component.core/pom.xml (working copy) +@@ -31,6 +31,11 @@ + <description>eXo JCR Service core component</description> + <properties> + <jcr.test.configuration.file>/conf/standalone/test-configuration.xml</jcr.test.configuration.file> ++ <cache.enabled>true</cache.enabled> ++ <value.storage.enabled>true</value.storage.enabled> ++ <statistics.enabled>false</statistics.enabled> ++ <properties.url.suffix>.properties</properties.url.suffix> ++ <properties.url.prefix>classpath:/conf/standalone/default</properties.url.prefix> + </properties> + <dependencies> + <dependency> +@@ -222,95 +227,7 @@ + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> +- </dependency> +-  +- <dependency> +- <groupId>mysql</groupId> +- <artifactId>mysql-connector-java</artifactId> +- <version>5.1.8</version> +- <scope>test</scope> +- </dependency> +-  +- <dependency> +- <groupId>postgresql</groupId> +- <artifactId>postgresql</artifactId> +- <version>8.3-603.jdbc3</version> +- <scope>test</scope> +- </dependency> +-  +-  +-  +-  +-  +-  +-  +-  +-  +-  +-  +-  +-  +-  +-  +-  +-  ++ </dependency> + </dependencies> +  + <build> +@@ -383,11 +300,22 @@ + <name>emma.coverage.out.file</name> + <value>target/emma/coverage.ec</value> + </property> +-  +-  ++ <value>${statistics.enabled}</value> ++ </property> ++ <property> ++ <name>exo.properties.url</name> ++ <value>${properties.url.prefix}${properties.url.suffix}</value> ++ </property> +  + <property> +@@ -569,6 +497,22 @@ + <value>target/emma/coverage.ec</value> + </property> + <property> ++ <name>cache-enabled</name> ++ <value>${cache.enabled}</value> ++ </property> ++ <property> ++ <name>value-storage-enabled</name> ++ <value>${value.storage.enabled}</value> ++ </property> ++ <property> ++ <name>JDBCWorkspaceDataContainer.statistics.enabled</name> ++ <value>${statistics.enabled}</value> ++ </property> ++ <property> ++ <name>exo.properties.url</name> ++ <value>${properties.url.prefix}${properties.url.suffix}</value> ++ </property> ++ <property> + <name>known.issues</name> + <value>org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testBooleanProperty + org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testMultipleBooleanProperty +@@ -585,11 +529,6 @@ + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion + org.apache.jackrabbit.test.api.NamespaceRegistryTest#testRegisterNamespace</value> + </property> +-  +-  +  + <property> +@@ -656,6 +595,22 @@ + <value>target/emma/coverage.ec</value> + </property> + <property> ++ <name>cache-enabled</name> ++ <value>${cache.enabled}</value> ++ </property> ++ <property> ++ <name>value-storage-enabled</name> ++ <value>${value.storage.enabled}</value> ++ </property> ++ <property> ++ <name>JDBCWorkspaceDataContainer.statistics.enabled</name> ++ <value>${statistics.enabled}</value> ++ </property> ++ <property> ++ <name>exo.properties.url</name> ++ <value>${properties.url.prefix}${properties.url.suffix}</value> ++ </property> ++ <property> + <name>known.issues</name> + <value>org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testBooleanProperty + org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testMultipleBooleanProperty +@@ -672,11 +627,6 @@ + org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion + org.apache.jackrabbit.test.api.NamespaceRegistryTest#testRegisterNamespace</value> + </property> +-  +-  +  + <property> +@@ -746,58 +696,223 @@ + </plugins> + </build> + </profile> ++  + <profile> +- <id>run-devtests</id> +- <build> +- <plugins> +- <plugin> +- <groupId>org.apache.maven.plugins</groupId> +- <artifactId>maven-surefire-plugin</artifactId> +- <configuration> +- <phase>test</phase> +- <forkMode>never</forkMode> +-  +- <goals> +- <goal>test</goal> +- </goals> +- <systemProperties> +- <property> +- <name>jcr.test.configuration.file</name> +- <value>${jcr.test.configuration.file}</value> +- </property> +-  +-  +-  +- <property> +- <name>java.net.preferIPv4Stack</name> +- <value>true</value> +- </property> +-  +- <property> +- <name>bind.address</name> +- <value>127.0.0.1</value> +- </property> +- <property> +- <name>jgroups.stack</name> +- <value>udp</value> +- </property> +- </systemProperties> +- <includes> +- <include>**/**/reading_/Test*.java</include> +- <include>**/**/writing_/Test*.java</include> +- <include>**/**/TestJBossCacheWorkspaceStorageCache_.java</include> +- <exclude>**/**/TestCleanableFileStreamValueData.java</exclude> +- <include>**/**/TestSVNodeDataOptimization_.java</include> +- <include>**/**/TestValueConstraints.java</include> +- </includes> +- </configuration> +- </plugin> +- </plugins> +- </build> ++ <id>oracle-10G-R2</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/oracle</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>ojdbc</groupId> ++ <artifactId>ojdbc</artifactId> ++ <version>10.2.0.4</version> ++ <scope>test</scope> ++ </dependency> ++ <dependency> ++ <groupId>ojdbc</groupId> ++ <artifactId>orai18n</artifactId> ++ <version>10.2.0.4</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> + </profile> ++ <profile> ++ <id>oracle-11G-R1</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/oracle</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>ojdbc</groupId> ++ <artifactId>ojdbc</artifactId> ++ <version>11.1.0.6.0</version> ++ <scope>test</scope> ++ </dependency> ++ <dependency> ++ <groupId>ojdbc</groupId> ++ <artifactId>orai18n</artifactId> ++ <version>11.1.0.6.0</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>oracle-11G-R2</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/oracle</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>ojdbc</groupId> ++ <artifactId>ojdbc</artifactId> ++ <version>11.2.0.1.0</version> ++ <scope>test</scope> ++ </dependency> ++ <dependency> ++ <groupId>ojdbc</groupId> ++ <artifactId>orai18n</artifactId> ++ <version>11.2.0.1.0</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>mysql-5.0</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/mysql</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>mysql</groupId> ++ <artifactId>mysql-connector-java</artifactId> ++ <version>5.0.8</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>mysql-5.1</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/mysql</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>mysql</groupId> ++ <artifactId>mysql-connector-java</artifactId> ++ <version>5.1.14</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>mysql-5.5</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/mysql</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>mysql</groupId> ++ <artifactId>mysql-connector-java</artifactId> ++ <version>5.1.18</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>mssql</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/mssql</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>com.microsoft</groupId> ++ <artifactId>sqljdbc</artifactId> ++ <version>3.0.1301.101</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>db2</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/db2</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>com.ibm.db2</groupId> ++ <artifactId>db2jcc</artifactId> ++ <version>9.7</version> ++ <scope>test</scope> ++ </dependency> ++ <dependency> ++ <groupId>com.ibm.db2</groupId> ++ <artifactId>db2jcc_license_cu</artifactId> ++ <version>9.7</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>sybase</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/sybase</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>com.sybase.jdbc4.jdbc</groupId> ++ <artifactId>jconn4</artifactId> ++ <version>26502</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>pgsql-8.2</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/pgsql</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>postgresql</groupId> ++ <artifactId>postgresql</artifactId> ++ <version>8.2-507.jdbc4</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>pgsql-8.3</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/pgsql</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>postgresql</groupId> ++ <artifactId>postgresql</artifactId> ++ <version>8.3-606.jdbc4</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>pgsql-8.4</id> ++ <properties> ++ <properties.url.prefix>classpath:/conf/standalone/pgsql</properties.url.prefix> ++ </properties> ++ <dependencies> ++ <dependency> ++ <groupId>postgresql</groupId> ++ <artifactId>postgresql</artifactId> ++ <version>8.4-702.jdbc4</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ </profile> ++ <profile> ++ <id>sjdbc</id> ++ <properties> ++ <jcr.test.configuration.file>/conf/standalone/test-configuration-sjdbc.xml</jcr.test.configuration.file> ++ <properties.url.suffix>-sjdbc.properties</properties.url.suffix> ++ </properties> ++ </profile> ++ <profile> ++ <id>cluster</id> ++ <properties> ++ <jcr.test.configuration.file>/conf/standalone/cluster/test-configuration.xml</jcr.test.configuration.file> ++ </properties> ++ </profile> ++ <profile> ++ <id>cache-disabled</id> ++ <properties> ++ <cache.enabled>false</cache.enabled> ++ </properties> ++ </profile> ++ <profile> ++ <id>value-storage-disabled</id> ++ <properties> ++ <value.storage.enabled>false</value.storage.enabled> ++ </properties> ++ </profile> + </profiles> + </project>

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r5198 - in kernel/branches/2.2.x/patch/2.2.11-GA: KER-180 and 1 other directory.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2011-11-17 09:08:02 -0500 (Thu, 17 Nov 2011) New Revision: 5198 Added: kernel/branches/2.2.x/patch/2.2.11-GA/KER-180/ kernel/branches/2.2.x/patch/2.2.11-GA/KER-180/KER-180.patch Log: KER-180 : Changes for the kernel from issue JCR-1689 was commited in patch KER-180.patch. Added: kernel/branches/2.2.x/patch/2.2.11-GA/KER-180/KER-180.patch =================================================================== --- kernel/branches/2.2.x/patch/2.2.11-GA/KER-180/KER-180.patch (rev 0) +++ kernel/branches/2.2.x/patch/2.2.11-GA/KER-180/KER-180.patch 2011-11-17 14:08:02 UTC (rev 5198) @@ -0,0 +1,76 @@ +Index: exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java +=================================================================== +--- exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java (revision 5185) ++++ exo.kernel.container/src/main/java/org/exoplatform/container/PropertyConfigurator.java (working copy) +@@ -62,32 +62,38 @@ + /** The logger. */ + private final Log log = ExoLogger.getExoLogger(PropertyConfigurator.class); + ++ public PropertyConfigurator(ConfigurationManager confManager) ++ { ++ this(null, confManager); ++ } ++ + public PropertyConfigurator(InitParams params, ConfigurationManager confManager) + { +- PropertiesParam propertiesParam = params.getPropertiesParam("properties"); +- if (propertiesParam != null) ++ String path = null; ++ if (params != null) + { +- log.debug("Going to initialize properties from init param"); +- for (Iterator<Property> i = propertiesParam.getPropertyIterator();i.hasNext();) ++ PropertiesParam propertiesParam = params.getPropertiesParam("properties"); ++ if (propertiesParam != null) + { +- Property property = i.next(); +- String name = property.getName(); +- String value = property.getValue(); +- log.debug("Adding property from init param " + name + " = " + value); +- PropertyManager.setProperty(name, value); ++ log.debug("Going to initialize properties from init param"); ++ for (Iterator<Property> i = propertiesParam.getPropertyIterator();i.hasNext();) ++ { ++ Property property = i.next(); ++ String name = property.getName(); ++ String value = property.getValue(); ++ log.debug("Adding property from init param " + name + " = " + value); ++ PropertyManager.setProperty(name, value); ++ } ++ } ++ ValueParam pathParam = params.getValueParam("properties.url"); ++ if (pathParam != null) ++ { ++ log.debug("Using file path " + path + " found from configuration"); ++ path = pathParam.getValue(); + } + } + + // +- String path = null; +- ValueParam pathParam = params.getValueParam("properties.url"); +- if (pathParam != null) +- { +- log.debug("Using file path " + path + " found from configuration"); +- path = pathParam.getValue(); +- } +- +- // + String systemPath = PropertyManager.getProperty(PropertyManager.PROPERTIES_URL); + if (systemPath != null) + { +Index: exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java +=================================================================== +--- exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java (revision 5185) ++++ exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java (working copy) +@@ -82,6 +82,10 @@ + configurationManager = new ConfigurationManagerImpl(configClassLoader, ExoContainer.getProfiles()); + this.registerComponentInstance(ConfigurationManager.class, configurationManager); + registerComponentImplementation(SessionManagerImpl.class); ++ // Workaround used to allow to use the PropertyConfigurator with the StandaloneContainer ++ // If the system property PropertyManager.PROPERTIES_URL has been set properly, it will load the properties ++ // from the file and load them as system properties ++ new PropertyConfigurator(configurationManager); + } + + /**

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r5197 - in jcr/branches/1.12.x: patch/1.12.11-GA and 1 other directories.

by do-not-reply＠jboss.org

Author: paristote Date: 2011-11-16 23:14:01 -0500 (Wed, 16 Nov 2011) New Revision: 5197 Added: jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1647/ jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1647/JCR-1647.patch jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1647/readme.txt Modified: jcr/branches/1.12.x/pom.xml Log: PLF-1747 JCR-1647 What is the problem to fix? Platform source distribution. Create a Zip archive with all projects sources. How is the problem fixed? Add a maven plugin to generate the Zip automatically during the release. Added: jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1647/JCR-1647.patch =================================================================== --- jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1647/JCR-1647.patch (rev 0) +++ jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1647/JCR-1647.patch 2011-11-17 04:14:01 UTC (rev 5197) @@ -0,0 +1,54 @@ +Index: pom.xml +=================================================================== +--- pom.xml (revision 4611) ++++ pom.xml (working copy) +@@ -46,6 +46,7 @@ + <org.exoplatform.core.version>2.3.10-GA-SNAPSHOT</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.10-GA-SNAPSHOT</org.exoplatform.ws.version> + <org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version> ++ <version.assembly.plugin>2.2.1</version.assembly.plugin> + </properties> + + <dependencyManagement> +@@ -450,6 +451,41 @@ + </testResource> + </testResources> + </build> ++<profiles> ++ <profile> ++ <id>release</id> ++ <build> ++ <plugins> ++ <plugin> ++ <artifactId>maven-assembly-plugin</artifactId> ++ <dependencies> ++ <dependency> ++ <groupId>org.apache.apache.resources</groupId> ++ <artifactId>apache-source-release-assembly-descriptor</artifactId> ++ <version>1.0.2</version> ++ </dependency> ++ </dependencies> ++ <executions> ++ <execution> ++ <id>source-release-assembly</id> ++ <phase>package</phase> ++ <goals> ++ <goal>single</goal> ++ </goals> ++ <configuration> ++ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> ++ <descriptorRefs> ++ <descriptorRef>source-release</descriptorRef> ++ </descriptorRefs> ++ <tarLongFileFormat>gnu</tarLongFileFormat> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ </plugins> ++ </build> ++ </profile> ++ </profiles> + <modules> + <module>exo.jcr.component.core</module> + <module>exo.jcr.component.statistics</module> Added: jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1647/readme.txt =================================================================== --- jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1647/readme.txt (rev 0) +++ jcr/branches/1.12.x/patch/1.12.11-GA/JCR-1647/readme.txt 2011-11-17 04:14:01 UTC (rev 5197) @@ -0,0 +1,63 @@ +Summary + + Status: Platform Source distribution + CCP Issue: N/A, Product Jira Issue: PLF-1747. + Complexity: N/A + +The Proposal +Problem description + +What is the problem to fix? + Platform source distribution. Create a Zip archive with all projects sources. + +Fix description + +How is the problem fixed? + Add a maven plugin to generate the Zip automatically during the release. + +Patch information: +Patch files: KER-176.patch + +Tests to perform + +Reproduction test + none + +Tests performed at DevLevel + mvn clean install -Prelease to make sure the project still builds successfully + +Tests performed at QA/Support Level + none + +Documentation changes + +Documentation changes: + none + +Configuration changes + +Configuration changes: + none + +Will previous configuration continue to work? + yes + +Risks and impacts + +Can this bug fix have any side effects on current client projects? + none + +Is there a performance risk/cost? + none + +Validation (PM/Support/QA) + +PM Comment +* PL review: Patch validated + +Support Comment +* Support review: Patch validated + +QA Feedbacks +* + Modified: jcr/branches/1.12.x/pom.xml =================================================================== --- jcr/branches/1.12.x/pom.xml 2011-11-17 04:13:35 UTC (rev 5196) +++ jcr/branches/1.12.x/pom.xml 2011-11-17 04:14:01 UTC (rev 5197) @@ -46,6 +46,7 @@ <org.exoplatform.core.version>2.3.11-GA-SNAPSHOT</org.exoplatform.core.version> <org.exoplatform.ws.version>2.1.11-GA-SNAPSHOT</org.exoplatform.ws.version> <org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version> + <version.assembly.plugin>2.2.1</version.assembly.plugin> </properties> <dependencyManagement> @@ -450,6 +451,41 @@ </testResource> </testResources> </build> +<profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.apache.resources</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId> + <version>1.0.2</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>source-release-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <descriptorRefs> + <descriptorRef>source-release</descriptorRef> + </descriptorRefs> + <tarLongFileFormat>gnu</tarLongFileFormat> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <modules> <module>exo.jcr.component.core</module> <module>exo.jcr.component.statistics</module>

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r5196 - in ws/branches/2.1.x: patch/2.1.11-GA and 1 other directories.

by do-not-reply＠jboss.org

Author: paristote Date: 2011-11-16 23:13:35 -0500 (Wed, 16 Nov 2011) New Revision: 5196 Added: ws/branches/2.1.x/patch/2.1.11-GA/WS-268/ ws/branches/2.1.x/patch/2.1.11-GA/WS-268/WS-268.patch ws/branches/2.1.x/patch/2.1.11-GA/WS-268/readme.txt Modified: ws/branches/2.1.x/pom.xml Log: PLF-1747 WS-268 What is the problem to fix? Platform source distribution. Create a Zip archive with all projects sources. How is the problem fixed? Add a maven plugin to generate the Zip automatically during the release. Added: ws/branches/2.1.x/patch/2.1.11-GA/WS-268/WS-268.patch =================================================================== --- ws/branches/2.1.x/patch/2.1.11-GA/WS-268/WS-268.patch (rev 0) +++ ws/branches/2.1.x/patch/2.1.11-GA/WS-268/WS-268.patch 2011-11-17 04:13:35 UTC (rev 5196) @@ -0,0 +1,55 @@ +Index: pom.xml +=================================================================== +--- pom.xml (revision 5193) ++++ pom.xml (working copy) +@@ -43,7 +43,7 @@ + <properties> + <exo.product.name>exo-ws</exo.product.name> + <exo.product.specification>2.1</exo.product.specification> +- ++ <version.assembly.plugin>2.2.1</version.assembly.plugin> + <org.exoplatform.kernel.version>2.2.11-GA-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.11-GA-SNAPSHOT</org.exoplatform.core.version> + </properties> +@@ -181,5 +181,40 @@ + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> +- </dependencies> ++ </dependencies> ++<profiles> ++ <profile> ++ <id>release</id> ++ <build> ++ <plugins> ++ <plugin> ++ <artifactId>maven-assembly-plugin</artifactId> ++ <dependencies> ++ <dependency> ++ <groupId>org.apache.apache.resources</groupId> ++ <artifactId>apache-source-release-assembly-descriptor</artifactId> ++ <version>1.0.2</version> ++ </dependency> ++ </dependencies> ++ <executions> ++ <execution> ++ <id>source-release-assembly</id> ++ <phase>package</phase> ++ <goals> ++ <goal>single</goal> ++ </goals> ++ <configuration> ++ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> ++ <descriptorRefs> ++ <descriptorRef>source-release</descriptorRef> ++ </descriptorRefs> ++ <tarLongFileFormat>gnu</tarLongFileFormat> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ </plugins> ++ </build> ++ </profile> ++ </profiles> + </project> Added: ws/branches/2.1.x/patch/2.1.11-GA/WS-268/readme.txt =================================================================== --- ws/branches/2.1.x/patch/2.1.11-GA/WS-268/readme.txt (rev 0) +++ ws/branches/2.1.x/patch/2.1.11-GA/WS-268/readme.txt 2011-11-17 04:13:35 UTC (rev 5196) @@ -0,0 +1,63 @@ +Summary + + Status: Platform Source distribution + CCP Issue: N/A, Product Jira Issue: PLF-1747. + Complexity: N/A + +The Proposal +Problem description + +What is the problem to fix? + Platform source distribution. Create a Zip archive with all projects sources. + +Fix description + +How is the problem fixed? + Add a maven plugin to generate the Zip automatically during the release. + +Patch information: +Patch files: KER-176.patch + +Tests to perform + +Reproduction test + none + +Tests performed at DevLevel + mvn clean install -Prelease to make sure the project still builds successfully + +Tests performed at QA/Support Level + none + +Documentation changes + +Documentation changes: + none + +Configuration changes + +Configuration changes: + none + +Will previous configuration continue to work? + yes + +Risks and impacts + +Can this bug fix have any side effects on current client projects? + none + +Is there a performance risk/cost? + none + +Validation (PM/Support/QA) + +PM Comment +* PL review: Patch validated + +Support Comment +* Support review: Patch validated + +QA Feedbacks +* + Modified: ws/branches/2.1.x/pom.xml =================================================================== --- ws/branches/2.1.x/pom.xml 2011-11-17 04:13:03 UTC (rev 5195) +++ ws/branches/2.1.x/pom.xml 2011-11-17 04:13:35 UTC (rev 5196) @@ -43,7 +43,7 @@ <properties> <exo.product.name>exo-ws</exo.product.name> <exo.product.specification>2.1</exo.product.specification> - + <version.assembly.plugin>2.2.1</version.assembly.plugin> <org.exoplatform.kernel.version>2.2.11-GA-SNAPSHOT</org.exoplatform.kernel.version> <org.exoplatform.core.version>2.3.11-GA-SNAPSHOT</org.exoplatform.core.version> </properties> @@ -181,5 +181,40 @@ <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> - </dependencies> + </dependencies> +<profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.apache.resources</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId> + <version>1.0.2</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>source-release-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <descriptorRefs> + <descriptorRef>source-release</descriptorRef> + </descriptorRefs> + <tarLongFileFormat>gnu</tarLongFileFormat> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r5195 - in core/branches/2.3.x: patch and 2 other directories.

by do-not-reply＠jboss.org

Author: paristote Date: 2011-11-16 23:13:03 -0500 (Wed, 16 Nov 2011) New Revision: 5195 Added: core/branches/2.3.x/patch/2.3.11-GA/ core/branches/2.3.x/patch/2.3.11-GA/COR-243/ core/branches/2.3.x/patch/2.3.11-GA/COR-243/COR-243.patch core/branches/2.3.x/patch/2.3.11-GA/COR-243/readme.txt Modified: core/branches/2.3.x/pom.xml Log: PLF-1747 COR-243 What is the problem to fix? Platform source distribution. Create a Zip archive with all projects sources. How is the problem fixed? Add a maven plugin to generate the Zip automatically during the release. Added: core/branches/2.3.x/patch/2.3.11-GA/COR-243/COR-243.patch =================================================================== --- core/branches/2.3.x/patch/2.3.11-GA/COR-243/COR-243.patch (rev 0) +++ core/branches/2.3.x/patch/2.3.11-GA/COR-243/COR-243.patch 2011-11-17 04:13:03 UTC (rev 5195) @@ -0,0 +1,53 @@ +Index: pom.xml +=================================================================== +--- pom.xml (revision 5193) ++++ pom.xml (working copy) +@@ -37,7 +37,7 @@ + <properties> + <exo.product.name>exo-core</exo.product.name> + <exo.product.specification>2.3</exo.product.specification> +- ++ <version.assembly.plugin>2.2.1</version.assembly.plugin> + <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> + <org.exoplatform.kernel.version>2.2.11-GA-SNAPSHOT</org.exoplatform.kernel.version> + </properties> +@@ -379,4 +379,39 @@ + <scope>test</scope> + </dependency> + </dependencies> ++<profiles> ++ <profile> ++ <id>release</id> ++ <build> ++ <plugins> ++ <plugin> ++ <artifactId>maven-assembly-plugin</artifactId> ++ <dependencies> ++ <dependency> ++ <groupId>org.apache.apache.resources</groupId> ++ <artifactId>apache-source-release-assembly-descriptor</artifactId> ++ <version>1.0.2</version> ++ </dependency> ++ </dependencies> ++ <executions> ++ <execution> ++ <id>source-release-assembly</id> ++ <phase>package</phase> ++ <goals> ++ <goal>single</goal> ++ </goals> ++ <configuration> ++ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> ++ <descriptorRefs> ++ <descriptorRef>source-release</descriptorRef> ++ </descriptorRefs> ++ <tarLongFileFormat>gnu</tarLongFileFormat> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ </plugins> ++ </build> ++ </profile> ++ </profiles> + </project> Added: core/branches/2.3.x/patch/2.3.11-GA/COR-243/readme.txt =================================================================== --- core/branches/2.3.x/patch/2.3.11-GA/COR-243/readme.txt (rev 0) +++ core/branches/2.3.x/patch/2.3.11-GA/COR-243/readme.txt 2011-11-17 04:13:03 UTC (rev 5195) @@ -0,0 +1,63 @@ +Summary + + Status: Platform Source distribution + CCP Issue: N/A, Product Jira Issue: PLF-1747. + Complexity: N/A + +The Proposal +Problem description + +What is the problem to fix? + Platform source distribution. Create a Zip archive with all projects sources. + +Fix description + +How is the problem fixed? + Add a maven plugin to generate the Zip automatically during the release. + +Patch information: +Patch files: KER-176.patch + +Tests to perform + +Reproduction test + none + +Tests performed at DevLevel + mvn clean install -Prelease to make sure the project still builds successfully + +Tests performed at QA/Support Level + none + +Documentation changes + +Documentation changes: + none + +Configuration changes + +Configuration changes: + none + +Will previous configuration continue to work? + yes + +Risks and impacts + +Can this bug fix have any side effects on current client projects? + none + +Is there a performance risk/cost? + none + +Validation (PM/Support/QA) + +PM Comment +* PL review: Patch validated + +Support Comment +* Support review: Patch validated + +QA Feedbacks +* + Modified: core/branches/2.3.x/pom.xml =================================================================== --- core/branches/2.3.x/pom.xml 2011-11-17 04:12:35 UTC (rev 5194) +++ core/branches/2.3.x/pom.xml 2011-11-17 04:13:03 UTC (rev 5195) @@ -37,7 +37,7 @@ <properties> <exo.product.name>exo-core</exo.product.name> <exo.product.specification>2.3</exo.product.specification> - + <version.assembly.plugin>2.2.1</version.assembly.plugin> <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> <org.exoplatform.kernel.version>2.2.11-GA-SNAPSHOT</org.exoplatform.kernel.version> </properties> @@ -379,4 +379,39 @@ <scope>test</scope> </dependency> </dependencies> +<profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.apache.resources</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId> + <version>1.0.2</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>source-release-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <descriptorRefs> + <descriptorRef>source-release</descriptorRef> + </descriptorRefs> + <tarLongFileFormat>gnu</tarLongFileFormat> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r5194 - in kernel/branches/2.2.x: patch/2.2.11-GA and 1 other directories.

by do-not-reply＠jboss.org

Author: paristote Date: 2011-11-16 23:12:35 -0500 (Wed, 16 Nov 2011) New Revision: 5194 Added: kernel/branches/2.2.x/patch/2.2.11-GA/KER-176/ kernel/branches/2.2.x/patch/2.2.11-GA/KER-176/KER-176.patch kernel/branches/2.2.x/patch/2.2.11-GA/KER-176/readme.txt Modified: kernel/branches/2.2.x/pom.xml Log: PLF-1747 KER-176 What is the problem to fix? Platform source distribution. Create a Zip archive with all projects sources. How is the problem fixed? Add a maven plugin to generate the Zip automatically during the release. Added: kernel/branches/2.2.x/patch/2.2.11-GA/KER-176/KER-176.patch =================================================================== --- kernel/branches/2.2.x/patch/2.2.11-GA/KER-176/KER-176.patch (rev 0) +++ kernel/branches/2.2.x/patch/2.2.11-GA/KER-176/KER-176.patch 2011-11-17 04:12:35 UTC (rev 5194) @@ -0,0 +1,53 @@ +Index: pom.xml +=================================================================== +--- pom.xml (revision 5193) ++++ pom.xml (working copy) +@@ -40,6 +40,7 @@ + <exo.product.specification>2.2</exo.product.specification> + <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> + <forkMode>always</forkMode> ++ <version.assembly.plugin>2.2.1</version.assembly.plugin> + </properties> + + <scm> +@@ -211,5 +212,39 @@ + <scope>test</scope> + </dependency> + </dependencies> +- ++<profiles> ++ <profile> ++ <id>release</id> ++ <build> ++ <plugins> ++ <plugin> ++ <artifactId>maven-assembly-plugin</artifactId> ++ <dependencies> ++ <dependency> ++ <groupId>org.apache.apache.resources</groupId> ++ <artifactId>apache-source-release-assembly-descriptor</artifactId> ++ <version>1.0.2</version> ++ </dependency> ++ </dependencies> ++ <executions> ++ <execution> ++ <id>source-release-assembly</id> ++ <phase>package</phase> ++ <goals> ++ <goal>single</goal> ++ </goals> ++ <configuration> ++ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> ++ <descriptorRefs> ++ <descriptorRef>source-release</descriptorRef> ++ </descriptorRefs> ++ <tarLongFileFormat>gnu</tarLongFileFormat> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ </plugins> ++ </build> ++ </profile> ++ </profiles> + </project> Added: kernel/branches/2.2.x/patch/2.2.11-GA/KER-176/readme.txt =================================================================== --- kernel/branches/2.2.x/patch/2.2.11-GA/KER-176/readme.txt (rev 0) +++ kernel/branches/2.2.x/patch/2.2.11-GA/KER-176/readme.txt 2011-11-17 04:12:35 UTC (rev 5194) @@ -0,0 +1,63 @@ +Summary + + Status: Platform Source distribution + CCP Issue: N/A, Product Jira Issue: PLF-1747. + Complexity: N/A + +The Proposal +Problem description + +What is the problem to fix? + Platform source distribution. Create a Zip archive with all projects sources. + +Fix description + +How is the problem fixed? + Add a maven plugin to generate the Zip automatically during the release. + +Patch information: +Patch files: KER-176.patch + +Tests to perform + +Reproduction test + none + +Tests performed at DevLevel + mvn clean install -Prelease to make sure the project still builds successfully + +Tests performed at QA/Support Level + none + +Documentation changes + +Documentation changes: + none + +Configuration changes + +Configuration changes: + none + +Will previous configuration continue to work? + yes + +Risks and impacts + +Can this bug fix have any side effects on current client projects? + none + +Is there a performance risk/cost? + none + +Validation (PM/Support/QA) + +PM Comment +* PL review: Patch validated + +Support Comment +* Support review: Patch validated + +QA Feedbacks +* + Modified: kernel/branches/2.2.x/pom.xml =================================================================== --- kernel/branches/2.2.x/pom.xml 2011-11-16 10:27:24 UTC (rev 5193) +++ kernel/branches/2.2.x/pom.xml 2011-11-17 04:12:35 UTC (rev 5194) @@ -40,6 +40,7 @@ <exo.product.specification>2.2</exo.product.specification> <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> <forkMode>always</forkMode> + <version.assembly.plugin>2.2.1</version.assembly.plugin> </properties> <scm> @@ -211,5 +212,39 @@ <scope>test</scope> </dependency> </dependencies> - +<profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.apache.resources</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId> + <version>1.0.2</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>source-release-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <descriptorRefs> + <descriptorRef>source-release</descriptorRef> + </descriptorRefs> + <tarLongFileFormat>gnu</tarLongFileFormat> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r5193 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core.

by do-not-reply＠jboss.org

Author: dkuleshov Date: 2011-11-16 05:27:24 -0500 (Wed, 16 Nov 2011) New Revision: 5193 Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml Log: EXOJCR-1622: added language attribute for xml code examples, for better code blocks recognition Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml 2011-11-16 10:18:39 UTC (rev 5192) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml 2011-11-16 10:27:24 UTC (rev 5193) @@ -38,7 +38,7 @@ artifact, so the first thing you need to do is to add this artifact as a dependency to your pom.xml file</para> - <programlisting> <dependency> + <programlisting language="xml"> <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.tests</artifactId> <version>2.4.3-GA</version> @@ -50,7 +50,7 @@ file. For this purpose you may use <ulink url="http://maven.apache.org/plugins/maven-dependency-plugin/">maven-dependency-plugin</ulink></para> - <programlisting> <plugin> + <programlisting language="xml"> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> @@ -84,7 +84,7 @@ sources and resources, use <ulink url="http://mojo.codehaus.org/build-helper-maven-plugin/">build-helper-maven-plugin</ulink></para> - <programlisting> <plugin> + <programlisting language="xml"> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.3</version> @@ -126,7 +126,7 @@ </note>You also need to include all TCK tests using <ulink url="http://maven.apache.org/plugins/maven-surefire-plugin/">maven-surefire-plugin</ulink></para> - <programlisting> <plugin> + <programlisting language="xml"> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -160,7 +160,7 @@ <para>In addition you need to populate your Organization Service with organization data (TCK tests are designed to use this data):</para> - <programlisting> <external-component-plugins> + <programlisting language="xml"> <external-component-plugins> <target-component>org.exoplatform.services.organization.OrganizationService</target-component> <component-plugin> <name>init.service.listener</name>

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r5192 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core.

by do-not-reply＠jboss.org

Author: dkuleshov Date: 2011-11-16 05:18:39 -0500 (Wed, 16 Nov 2011) New Revision: 5192 Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml Log: EXOJCR-1622: removed exclusion of AbstractOrganizationTest.java in example of surefire-plugin-configuration Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml 2011-11-15 15:24:12 UTC (rev 5191) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml 2011-11-16 10:18:39 UTC (rev 5192) @@ -123,8 +123,7 @@ role="bold">source</emphasis> parameter should point to the location you've specified in <emphasis role="bold">outputDirectory</emphasis> parameter just above.</para> - </note>You may also need to include and exclude specific tests using - <ulink + </note>You also need to include all TCK tests using <ulink url="http://maven.apache.org/plugins/maven-surefire-plugin/">maven-surefire-plugin</ulink></para> <programlisting> <plugin> @@ -134,10 +133,7 @@ ... <includes> <include>org/exoplatform/services/tck/organization/Test*.java</include> - </includes> - <excludes> - <exclude>org/exoplatform/services/tck/organization/AbstractOrganizationServiceTest.java</exclude> - </excludes> + </includes> ... </configuration> </plugin></programlisting>

14 years, 5 months

1
0
0 / 0

exo-jcr SVN: r5191 - in jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules: core and 1 other directory.

by do-not-reply＠jboss.org

Author: dkuleshov Date: 2011-11-15 10:24:12 -0500 (Tue, 15 Nov 2011) New Revision: 5191 Added: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core.xml Log: EXOJCR-1622: added chapter to describe org service TCK tests configuration Added: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml (rev 0) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core/organization-service-tck-tests-config.xml 2011-11-15 15:24:12 UTC (rev 5191) @@ -0,0 +1,427 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" +"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> +<chapter> + <?dbhtml filename="organization-service-tests-config.html"?> + + <title>Organization Service TCK tests configuration</title> + + <section> + <title>Introduction</title> + + <para>The process of launching the Organization Service TCK tests against + your Organization Service is quite easy. For instance you may add TCK + tests to your maven project and launch them during unit testing phase. To + do that you need to complete the next two steps:</para> + + <itemizedlist> + <listitem> + <para>Configure your maven pom.xml file</para> + </listitem> + + <listitem> + <para>Configure standalone container and Organization Service</para> + + <note> + <para>If you need deeper investigation you can find Organization + Service TCK test sources at <ulink + url="https://anonsvn.jboss.org/repos/exo-jcr/core/trunk/exo.core.component.org...">svn</ulink></para> + </note> + </listitem> + </itemizedlist> + </section> + + <section> + <title>Maven pom.xml file configuration</title> + + <para>Organization Service TCK tests are available as a separate maven + artifact, so the first thing you need to do is to add this artifact as a + dependency to your pom.xml file</para> + + <programlisting> <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.tests</artifactId> + <version>2.4.3-GA</version> + <classifier>sources</classifier> + <scope>test</scope> + </dependency></programlisting> + + <para>You will also need to unpack tests as they are archieved within jar + file. For this purpose you may use <ulink + url="http://maven.apache.org/plugins/maven-dependency-plugin/">maven-dependency-plugin</ulink></para> + + <programlisting> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>generate-test-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.tests</artifactId> + <classifier>sources</classifier> + <type>jar</type> + <overWrite>false</overWrite> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/org-service-tck-tests</outputDirectory> + </configuration> + </execution> + </executions> + </plugin></programlisting> + + <para><note> + <para>Remember the value of <emphasis + role="bold">outputDirectory</emphasis> parameter as you will need it + later.</para> + </note>After you have unpacked the tests you need to add the tests + sources and resources, use <ulink + url="http://mojo.codehaus.org/build-helper-maven-plugin/">build-helper-maven-plugin</ulink></para> + + <programlisting> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>add-test-resource</id> + <phase>generate-test-sources</phase> + <goals> + <goal>add-test-resource</goal> + </goals> + <configuration> + <resources> + <resource> + <directory>${project.build.directory}/org-service-tck-tests</directory> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>add-test-source</id> + <phase>generate-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${project.build.directory}/org-service-tck-tests</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> </programlisting> + + <para><note> + <para><emphasis role="bold">directory</emphasis> and <emphasis + role="bold">source</emphasis> parameter should point to the location + you've specified in <emphasis role="bold">outputDirectory</emphasis> + parameter just above.</para> + </note>You may also need to include and exclude specific tests using + <ulink + url="http://maven.apache.org/plugins/maven-surefire-plugin/">maven-surefire-plugin</ulink></para> + + <programlisting> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + ... + <includes> + <include>org/exoplatform/services/tck/organization/Test*.java</include> + </includes> + <excludes> + <exclude>org/exoplatform/services/tck/organization/AbstractOrganizationServiceTest.java</exclude> + </excludes> + ... + </configuration> + </plugin></programlisting> + + <para>As a result you should have TCK being launched during your next + <emphasis>maven clean install</emphasis>. Example of configured pom.xml + file you can find at <ulink + url="http://svn.exoplatform.org/projects/jcr-services/trunk/pom.xml">svn + server</ulink></para> + </section> + + <section> + <title>Standalone container and Organization Service configuration</title> + + <para>TCK tests use standalone container, so to launch TCK tests propertly + you will also need to add Organization Service as a standalone component. + For that purpose use configuration file, which is to be located in + 'src/test/java/conf/standalone/test-configuration.xml' by default, but its + location can be changed by system property called + <emphasis>orgservice.test.configuration.file</emphasis>. Add your + Organization Service configuration with all needed components + there.</para> + + <para>In addition you need to populate your Organization Service with + organization data (TCK tests are designed to use this data):</para> + + <programlisting> <external-component-plugins> + <target-component>org.exoplatform.services.organization.OrganizationService</target-component> + <component-plugin> + <name>init.service.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type> + <description>this listener populate organization data for the first launch</description> + <init-params> + <value-param> + <name>checkDatabaseAlgorithm</name> + <description>check database</description> + <value>entry</value> + </value-param> + <value-param> + <name>printInformation</name> + <description>Print information init database</description> + <value>false</value> + </value-param> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.OrganizationConfig"> + <field name="membershipType"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>manager</string></field> + <field name="description"><string>manager membership type</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>member</string></field> + <field name="description"><string>member membership type</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>validator</string></field> + <field name="description"><string>validator membership type</string></field> + </object> + </value> + </collection> + </field> + + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>platform</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /platform group</string></field> + <field name="label"><string>Platform</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>administrators</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/administrators group</string></field> + <field name="label"><string>Administrators</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>users</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/users group</string></field> + <field name="label"><string>Users</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>guests</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/guests group</string></field> + <field name="label"><string>Guests</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>organization</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the organization group</string></field> + <field name="label"><string>Organization</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>management</string></field> + <field name="parentId"><string>/organization</string></field> + <field name="description"><string>the /organization/management group</string></field> + <field name="label"><string>Management</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>executive-board</string></field> + <field name="parentId"><string>/organization/management</string></field> + <field name="description"><string>the /organization/management/executive-board group</string></field> + <field name="label"><string>Executive Board</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>human-resources</string></field> + <field name="parentId"><string>/organization/management</string></field> + <field name="description"><string>the /organization/management/human-resource group</string></field> + <field name="label"><string>Human Resources</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>communication</string></field> + <field name="parentId"><string>/organization</string></field> + <field name="description"><string>the /organization/communication group</string></field> + <field name="label"><string>Communication</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>marketing</string></field> + <field name="parentId"><string>/organization/communication</string></field> + <field name="description"><string>the /organization/communication/marketing group</string></field> + <field name="label"><string>Marketing</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>press-and-media</string></field> + <field name="parentId"><string>/organization/communication</string></field> + <field name="description"><string>the /organization/communication/press-and-media group</string></field> + <field name="label"><string>Press and Media</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>operations</string></field> + <field name="parentId"><string>/organization</string></field> + <field name="description"><string>the /organization/operations and media group</string></field> + <field name="label"><string>Operations</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>sales</string></field> + <field name="parentId"><string>/organization/operations</string></field> + <field name="description"><string>the /organization/operations/sales group</string></field> + <field name="label"><string>Sales</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>finances</string></field> + <field name="parentId"><string>/organization/operations</string></field> + <field name="description"><string>the /organization/operations/finances group</string></field> + <field name="label"><string>Finances</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>customers</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /customers group</string></field> + <field name="label"><string>Customers</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>partners</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /partners group</string></field> + <field name="label"><string>Partners</string></field> + </object> + </value> + </collection> + </field> + + <field name="user"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>root</string></field> + <field name="password"><string>exo</string></field> + <field name="firstName"><string>Root</string></field> + <field name="lastName"><string>Root</string></field> + <field name="email"><string>root@localhost</string></field> + <field name="groups"> + <string> + manager:/platform/administrators,member:/platform/users, + member:/organization/management/executive-board + </string> + </field> + </object> + </value> + + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>john</string></field> + <field name="password"><string>exo</string></field> + <field name="firstName"><string>John</string></field> + <field name="lastName"><string>Anthony</string></field> + <field name="email"><string>john@localhost</string></field> + <field name="groups"> + <string> + member:/platform/administrators,member:/platform/users, + manager:/organization/management/executive-board + </string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>marry</string></field> + <field name="password"><string>exo</string></field> + <field name="firstName"><string>Marry</string></field> + <field name="lastName"><string>Kelly</string></field> + <field name="email"><string>marry@localhost</string></field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>demo</string></field> + <field name="password"><string>exo</string></field> + <field name="firstName"><string>Demo</string></field> + <field name="lastName"><string>exo</string></field> + <field name="email"><string>demo@localhost</string></field> + <field name="groups"> + <string>member:/platform/guests,member:/platform/users</string> + </field> + </object> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.organization.OrganizationService</target-component> + <component-plugin> + <name>tester.membership.type.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.MembershipTypeEventListener</type> + <description>Membership type listerner for testing purpose</description> + </component-plugin> + </external-component-plugins> +</programlisting> + + <para>Ultimately you will have a configuration file which determines + standalone container and consists of Organization Service configuration + and initialization data. You can find prepared test-configuration.xml file + at <ulink + url="http://svn.exoplatform.org/projects/jcr-services/trunk/src/test/java/conf...">svn</ulink></para> + </section> +</chapter> Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core.xml =================================================================== --- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core.xml 2011-11-15 15:19:02 UTC (rev 5190) +++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/core.xml 2011-11-15 15:24:12 UTC (rev 5191) @@ -38,9 +38,12 @@ <xi:include href="core/ldap-configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="core/organization-service-tck-tests-config.xml" + xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="core/tika-document-reader-service.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - + <xi:include href="core/digest-auth.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> </part>

14 years, 5 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

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"> -  <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"> -  <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"> -  <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"> -  - <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>

14 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits November 2011