[exo-jcr-commits] exo-jcr SVN: r4785 - in jcr/trunk/exo.jcr.component.core: src/main/java/org/exoplatform/services/jcr/impl/storage/value and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Aug 22 07:57:00 EDT 2011
Author: tolusha
Date: 2011-08-22 07:57:00 -0400 (Mon, 22 Aug 2011)
New Revision: 4785
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/StandaloneStoragePluginProvider.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java
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-1486: Support to disable value-storage
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2011-08-22 11:12:23 UTC (rev 4784)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-08-22 11:57:00 UTC (rev 4785)
@@ -33,6 +33,7 @@
<jcr.test.configuration.file>/conf/standalone/test-configuration-jbc.xml</jcr.test.configuration.file>
<jbosscache.shareable>true</jbosscache.shareable>
<cache.enabled>true</cache.enabled>
+ <value.storage.enabled>true</value.storage.enabled>
<jbc.specific.1>**/jbc/**</jbc.specific.1>
<jbc.specific.2>**/jbosscache/**</jbc.specific.2>
<ispn.specific.1>**/ispn/**</ispn.specific.1>
@@ -390,6 +391,10 @@
<name>cache-enabled</name>
<value>${cache.enabled}</value>
</property>
+ <property>
+ <name>value-storage-enabled</name>
+ <value>${value.storage.enabled}</value>
+ </property>
<!-- Uncomment the line below if you want to enable the statistics -->
<!--property>
<name>JDBCWorkspaceDataContainer.statistics.enabled</name>
@@ -615,6 +620,10 @@
<name>cache-enabled</name>
<value>${cache.enabled}</value>
</property>
+ <property>
+ <name>value-storage-enabled</name>
+ <value>${value.storage.enabled}</value>
+ </property>
<property>
<name>known.issues</name>
<value>org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreName
@@ -703,6 +712,10 @@
<value>${cache.enabled}</value>
</property>
<property>
+ <name>value-storage-enabled</name>
+ <value>${value.storage.enabled}</value>
+ </property>
+ <property>
<name>known.issues</name>
<value>org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreName
org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreOrder2
@@ -791,11 +804,10 @@
<name>cache-enabled</name>
<value>${cache.enabled}</value>
</property>
- <!-- Uncomment the line below if you want to enable the statistics -->
- <!--property>
- <name>JDBCWorkspaceDataContainer.statistics.enabled</name>
- <value>true</value>
- </property-->
+ <property>
+ <name>value-storage-enabled</name>
+ <value>${value.storage.enabled}</value>
+ </property>
<!-- We add this system property due to some incompatibility between IPv6 and
some JVM of Linux distributions such as Ubuntu and Fedora-->
<property>
@@ -865,6 +877,12 @@
</properties>
</profile>
<profile>
+ <id>value-storage-disabled</id>
+ <properties>
+ <value.storage.enabled>false</value.storage.enabled>
+ </properties>
+ </profile>
+ <profile>
<id>sjdbc</id>
<properties>
<jcr.test.configuration.file>/conf/standalone/test-configuration-sjdbc-jbc.xml</jcr.test.configuration.file>
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/StandaloneStoragePluginProvider.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/StandaloneStoragePluginProvider.java 2011-08-22 11:12:23 UTC (rev 4784)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/StandaloneStoragePluginProvider.java 2011-08-22 11:57:00 UTC (rev 4785)
@@ -55,9 +55,17 @@
private static final long serialVersionUID = 4537116106932443262L;
+ /**
+ * Logger.
+ */
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 +81,64 @@
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);
+ }
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java 2011-08-22 11:12:23 UTC (rev 4784)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java 2011-08-22 11:57:00 UTC (rev 4785)
@@ -139,7 +139,7 @@
}
}
- for (int i = 0; i < count; i++)
+ for (int i = 0; i < channels.size(); i++)
{
try
{
@@ -155,7 +155,7 @@
mySession.save();
// checking whether values are still in value storage.
- for (int i = 0; i < count; i++)
+ for (int i = 0; i < channels.size(); i++)
{
try
{
@@ -177,7 +177,6 @@
{
log.warn("Value storages are not configured, test skipped.");
}
-
}
@Override
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-22 11:12:23 UTC (rev 4784)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-jbc.xml 2011-08-22 11:57:00 UTC (rev 4785)
@@ -34,6 +34,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" />
@@ -104,6 +105,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" />
@@ -179,6 +181,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" />
@@ -255,6 +258,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" />
@@ -268,6 +272,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" />
@@ -355,6 +360,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" />
@@ -424,6 +430,7 @@
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" />
@@ -504,6 +511,7 @@
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" />
@@ -586,6 +594,7 @@
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" />
@@ -666,6 +675,7 @@
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" />
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-22 11:12:23 UTC (rev 4784)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-08-22 11:57:00 UTC (rev 4785)
@@ -39,6 +39,7 @@
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" />
@@ -102,6 +103,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" />
@@ -168,6 +170,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" />
@@ -239,6 +242,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" />
@@ -252,6 +256,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" />
@@ -333,6 +338,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" />
@@ -398,6 +404,7 @@
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" />
@@ -472,6 +479,7 @@
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" />
@@ -546,6 +554,7 @@
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" />
@@ -619,6 +628,7 @@
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" />
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-22 11:12:23 UTC (rev 4784)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-08-22 11:57:00 UTC (rev 4785)
@@ -45,10 +45,10 @@
<properties>
<property name="path" value="target/temp/values/ws" />
<property name="digest-algo" value="MD5" />
- <property name="vcas-type"
- value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" />
+ <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" />
@@ -101,10 +101,10 @@
<property name="swap-directory" value="target/temp/swap/ws1" />
</properties>
<value-storages>
- <value-storage id="ws1"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <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" />
@@ -160,10 +160,10 @@
<property name="swap-directory" value="target/temp/swap/ws2" />
</properties>
<value-storages>
- <value-storage id="ws2"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <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" />
@@ -224,23 +224,22 @@
This storage is used to check whether properties are removed correctly from each value-storage
(TestRemoveFromValueStorage.java)
-->
- <value-storage id="ws3_big"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <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">
+ <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="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" />
@@ -315,6 +314,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" />
@@ -373,6 +373,7 @@
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" />
@@ -440,6 +441,7 @@
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" />
@@ -507,6 +509,7 @@
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" />
@@ -573,6 +576,7 @@
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" />
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-22 11:12:23 UTC (rev 4784)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-08-22 11:57:00 UTC (rev 4785)
@@ -49,6 +49,7 @@
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" />
@@ -105,6 +106,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" />
@@ -164,6 +166,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" />
@@ -228,6 +231,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" />
@@ -241,6 +245,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" />
@@ -316,6 +321,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" />
@@ -374,6 +380,7 @@
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" />
@@ -441,6 +448,7 @@
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" />
@@ -508,6 +516,7 @@
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" />
@@ -574,6 +583,7 @@
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" />
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-22 11:12:23 UTC (rev 4784)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-08-22 11:57:00 UTC (rev 4785)
@@ -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" />
@@ -99,6 +100,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" />
@@ -152,6 +154,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" />
@@ -211,6 +214,7 @@
<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" />
@@ -222,6 +226,7 @@
<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" />
@@ -290,6 +295,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" />
@@ -343,6 +349,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" />
@@ -407,6 +414,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" />
@@ -467,6 +475,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" />
@@ -526,6 +535,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" />
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-22 11:12:23 UTC (rev 4784)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2011-08-22 11:57:00 UTC (rev 4785)
@@ -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" />
@@ -99,6 +100,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" />
@@ -152,6 +154,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" />
@@ -211,6 +214,7 @@
<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" />
@@ -222,6 +226,7 @@
<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" />
@@ -290,6 +295,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" />
@@ -343,6 +349,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" />
@@ -407,6 +414,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" />
@@ -467,6 +475,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" />
@@ -526,6 +535,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" />
More information about the exo-jcr-commits
mailing list