[exo-jcr-commits] exo-jcr SVN: r4782 - in jcr/trunk/exo.jcr.component.core/src: main/resources and 2 other directories.

Author: tolusha Date: 2011-08-19 07:58:14 -0400 (Fri, 19 Aug 2011) New Revision: 4782 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/ConfigurationFormat.java jcr/trunk/exo.jcr.component.core/src/main/resources/binding.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml Log: EXOJCR-852: add profiles to run tests without cache Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/ConfigurationFormat.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/ConfigurationFormat.java 2011-08-19 11:52:03 UTC (rev 4781) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/ConfigurationFormat.java 2011-08-19 11:58:14 UTC (rev 4782) @@ -37,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 Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/binding.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/binding.xml 2011-08-19 11:52:03 UTC (rev 4781) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/binding.xml 2011-08-19 11:58:14 UTC (rev 4782) @@ -1,6 +1,8 @@ <binding> <!-- the default deserializer to use for String --> <format type="java.lang.String" deserializer="org.exoplatform.container.xml.Deserializer.resolveString"/> + <!-- the default deserializer to use for boolean --> + <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" /> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml 2011-08-19 11:52:03 UTC (rev 4781) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml 2011-08-19 11:58:14 UTC (rev 4782) @@ -46,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" /> @@ -111,7 +111,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" /> @@ -186,7 +186,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" /> @@ -275,7 +275,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" /> @@ -368,7 +368,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" + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="test-jbosscache-data.xml" /> @@ -438,7 +438,7 @@ 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" /> @@ -518,7 +518,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" /> @@ -600,7 +600,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" /> @@ -680,7 +680,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" /> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-08-19 11:52:03 UTC (rev 4781) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-08-19 11:58:14 UTC (rev 4782) @@ -51,7 +51,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.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" /> @@ -109,7 +109,7 @@ </value-storage> </value-storages> </container> - <cache enabled="true" + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" /> @@ -175,7 +175,7 @@ </value-storage> </value-storages> </container> - <cache enabled="true" + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" /> @@ -264,7 +264,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.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" /> @@ -347,7 +347,7 @@ value="*:/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.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" /> @@ -411,7 +411,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.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" /> @@ -486,7 +486,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.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" /> @@ -560,7 +560,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.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" /> @@ -633,7 +633,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.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-config.xml" /> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-08-19 11:52:03 UTC (rev 4781) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-08-19 11:58:14 UTC (rev 4782) @@ -61,7 +61,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="conf/standalone/test-jbosscache-config.xml" /> @@ -112,7 +112,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="conf/standalone/test-jbosscache-config.xml" /> @@ -171,7 +171,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="conf/standalone/test-jbosscache-config.xml" /> @@ -253,7 +253,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="conf/standalone/test-jbosscache-config.xml" /> @@ -329,7 +329,7 @@ value="*:/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="conf/standalone/test-jbosscache-config.xml" /> @@ -386,7 +386,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="conf/standalone/test-jbosscache-config.xml" /> @@ -454,7 +454,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="conf/standalone/test-jbosscache-config.xml" /> @@ -521,7 +521,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="conf/standalone/test-jbosscache-config.xml" /> @@ -587,7 +587,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="conf/standalone/test-jbosscache-config.xml" /> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-08-19 11:52:03 UTC (rev 4781) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-08-19 11:58:14 UTC (rev 4782) @@ -61,7 +61,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="conf/standalone/test-jbosscache-config.xml" /> @@ -112,7 +112,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="conf/standalone/test-jbosscache-config.xml" /> @@ -171,7 +171,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="conf/standalone/test-jbosscache-config.xml" /> @@ -253,7 +253,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="conf/standalone/test-jbosscache-config.xml" /> @@ -330,7 +330,7 @@ value="*:/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="conf/standalone/test-jbosscache-config.xml" /> @@ -387,7 +387,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="conf/standalone/test-jbosscache-config.xml" /> @@ -455,7 +455,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="conf/standalone/test-jbosscache-config.xml" /> @@ -522,7 +522,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="conf/standalone/test-jbosscache-config.xml" /> @@ -588,7 +588,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="conf/standalone/test-jbosscache-config.xml" /> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-08-19 11:52:03 UTC (rev 4781) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-08-19 11:58:14 UTC (rev 4782) @@ -59,7 +59,7 @@ <property name="root-nodetype" value="nt:unstructured" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -106,7 +106,7 @@ </value-storage> </value-storages> </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -159,7 +159,7 @@ </value-storage> </value-storages> </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -234,7 +234,7 @@ <property name="root-nodetype" value="nt:unstructured" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -303,7 +303,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.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -356,7 +356,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.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -420,7 +420,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.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -480,7 +480,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.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -539,7 +539,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.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2011-08-19 11:52:03 UTC (rev 4781) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2011-08-19 11:58:14 UTC (rev 4782) @@ -59,7 +59,7 @@ <property name="root-nodetype" value="nt:unstructured" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -106,7 +106,7 @@ </value-storage> </value-storages> </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -159,7 +159,7 @@ </value-storage> </value-storages> </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -234,7 +234,7 @@ <property name="root-nodetype" value="nt:unstructured" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -303,7 +303,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.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -356,7 +356,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.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -420,7 +420,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.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -480,7 +480,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.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties> @@ -539,7 +539,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.infinispan.ISPNCacheWorkspaceStorageCache"> + <cache enabled="${cache-enabled}" class="org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.ISPNCacheWorkspaceStorageCache"> <properties> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> </properties>