[exo-jcr-commits] exo-jcr SVN: r4007 - in jcr/trunk/exo.jcr.component.core/src: test/resources/conf/standalone/cluster and 1 other directory.

Author: tolusha Date: 2011-02-22 10:03:27 -0500 (Tue, 22 Feb 2011) New Revision: 4007 Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-ispn.xml Log: EXOJCR-832: add configurations Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java 2011-02-22 14:52:13 UTC (rev 4006) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexUpdateMonitor.java 2011-02-22 15:03:27 UTC (rev 4007) @@ -76,11 +76,16 @@ private final IndexUpdateKey updateKey; /** + * ISPNIndexUpdateMonitor constructor. * * @param wsId + * unique workspace identifier * @param cache + * ISPN cache * @param system + * notifies if this IndexInfos is from system search manager or not * @param modeHandler + * used to retrieve the current mode */ public ISPNIndexUpdateMonitor(String wsId, Cache<Serializable, Object> cache, boolean system, IndexerIoModeHandler modeHandler) Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml 2011-02-22 15:03:27 UTC (rev 4007) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> +<infinispan + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd" + xmlns="urn:infinispan:config:4.0"> + + <global> + <globalJmxStatistics jmxDomain="infinispan" enabled="true" allowDuplicateDomains="true"/> + + <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="${infinispan-cluster-name}" distributedSyncTimeout="20000"> + <properties> + <property name="configurationFile" value="${jgroups-configuration}"/> + </properties> + </transport> + </global> + + <default> + <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500"/> + <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> + <jmxStatistics enabled="true"/> + <deadlockDetection enabled="true" spinDuration="100"/> + </default> +</infinispan> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-ispn.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-ispn.xml 2011-02-22 14:52:13 UTC (rev 4006) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-ispn.xml 2011-02-22 15:03:27 UTC (rev 4007) @@ -69,6 +69,11 @@ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> <property name="index-dir" value="target/temp/index/db1/ws" /> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> + <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" /> + <property name="jgroups-configuration" value="flush-udp.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.infinispan.ISPNCacheableLockManagerImpl"> @@ -119,6 +124,11 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> + <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" /> + <property name="jgroups-configuration" value="flush-udp.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> <property name="index-dir" value="target/temp/index/db1/ws1" /> <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> <property name="synonymprovider-config-path" value="../../../synonyms.properties" /> @@ -176,6 +186,11 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> + <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" /> + <property name="jgroups-configuration" value="flush-udp.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> <property name="index-dir" value="target/temp/index/db1/ws2" /> <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> <property name="synonymprovider-config-path" value="../../../synonyms.properties" /> @@ -251,6 +266,11 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> + <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" /> + <property name="jgroups-configuration" value="flush-udp.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> <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" /> @@ -324,6 +344,11 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> + <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" /> + <property name="jgroups-configuration" value="flush-udp.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> <property name="index-dir" value="target/temp/index/db2/ws" /> </properties> </query-handler> @@ -381,6 +406,11 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> + <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" /> + <property name="jgroups-configuration" value="flush-udp.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> <property name="index-dir" value="target/temp/index/db2/ws1" /> </properties> </query-handler> @@ -448,6 +478,11 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> + <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" /> + <property name="jgroups-configuration" value="flush-udp.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> <property name="index-dir" value="target/temp/index/db1tck/ws" /> <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> <property name="synonymprovider-config-path" value="../../../synonyms.properties" /> @@ -512,6 +547,11 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> + <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" /> + <property name="jgroups-configuration" value="flush-udp.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> <property name="index-dir" value="target/temp/index/db1tck/ws1" /> <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> <property name="synonymprovider-config-path" value="../../../synonyms.properties" /> @@ -575,6 +615,11 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.ispn.ISPNIndexChangesFilter" /> + <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-indexer.xml" /> + <property name="jgroups-configuration" value="flush-udp.xml" /> + <property name="infinispan-cluster-name" value="JCR-cluster" /> + <property name="max-volatile-time" value="60" /> <property name="index-dir" value="target/temp/index/db1tck/ws2" /> <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> <property name="synonymprovider-config-path" value="../../../synonyms.properties" />