exo-jcr SVN: r1616 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache.
by do-not-reply@jboss.org
Author: nzamosenchuk
Date: 2010-01-29 03:23:30 -0500 (Fri, 29 Jan 2010)
New Revision: 1616
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
Log:
EXOJCR-425: If mux not enabled, but jGroups configuration file exists then it is used.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2010-01-28 16:45:14 UTC (rev 1615)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2010-01-29 08:23:30 UTC (rev 1616)
@@ -156,6 +156,25 @@
throw new RepositoryConfigurationException("Error setting multiplexer configuration.", e);
}
}
+ else
+ {
+ // Multiplexer is not enabled. If jGroups configuration preset it is applied
+ String jgroupsConfigurationFilePath = parameterEntry.getParameterValue(JGROUPS_CONFIG, null);
+ if (jgroupsConfigurationFilePath != null)
+ {
+ try
+ {
+ cache.getConfiguration().setJgroupsConfigFile(
+ configurationManager.getResource(jgroupsConfigurationFilePath));
+ log.info("Custom JGroups configuration set:"
+ + configurationManager.getResource(jgroupsConfigurationFilePath));
+ }
+ catch (Exception e)
+ {
+ throw new RepositoryConfigurationException("Error setting JGroups configuration.", e);
+ }
+ }
+ }
return cache;
}
}
14 years, 3 months
exo-jcr SVN: r1615 - in jcr/trunk/exo.jcr.component.core/src: test/resources/conf/standalone/mux and 1 other directory.
by do-not-reply@jboss.org
Author: nzamosenchuk
Date: 2010-01-28 11:45:14 -0500 (Thu, 28 Jan 2010)
New Revision: 1615
Added:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp-mux.xml
Removed:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp.xml
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-data.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-indexer.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-lock.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jcr-config.xml
Log:
EXOJCR-425: added support for "jar:/" and etc in jGroups configuration file. Also changed name of mux-stack.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2010-01-28 15:45:00 UTC (rev 1614)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2010-01-28 16:45:14 UTC (rev 1615)
@@ -62,6 +62,8 @@
private final TransactionManager transactionManager;
+ private ConfigurationManager configurationManager;
+
private final Log log = ExoLogger.getLogger(ExoJBossCacheFactory.class);
/**
@@ -73,6 +75,7 @@
*/
public ExoJBossCacheFactory(ConfigurationManager configurationManager, TransactionManager transactionManager)
{
+ this.configurationManager = configurationManager;
this.configurationHelper = TemplateConfigurationHelper.createJBossCacheHelper(configurationManager);
this.transactionManager = transactionManager;
}
@@ -84,8 +87,7 @@
*/
public ExoJBossCacheFactory(ConfigurationManager configurationManager)
{
- this.configurationHelper = TemplateConfigurationHelper.createJBossCacheHelper(configurationManager);
- this.transactionManager = null;
+ this(configurationManager, null);
}
/**
@@ -142,7 +144,7 @@
{
// Create and inject multiplexer fatory
JChannelFactory muxFactory = new JChannelFactory();
- muxFactory.setMultiplexerConfig(jgroupsConfigurationFilePath);
+ muxFactory.setMultiplexerConfig(configurationManager.getResource(jgroupsConfigurationFilePath));
cache.getConfiguration().getRuntimeConfig().setMuxChannelFactory(muxFactory);
log.info("Multiplexer stack successfully inabled for the cache.");
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-data.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-data.xml 2010-01-28 15:45:00 UTC (rev 1614)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-data.xml 2010-01-28 16:45:14 UTC (rev 1615)
@@ -7,7 +7,7 @@
<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
- <jgroupsConfig multiplexerStack="grid.jgroups.stack"/>
+ <jgroupsConfig multiplexerStack="jcr.stack"/>
<sync />
</clustering>
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-indexer.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-indexer.xml 2010-01-28 15:45:00 UTC (rev 1614)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-indexer.xml 2010-01-28 16:45:14 UTC (rev 1615)
@@ -10,7 +10,7 @@
<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
- <jgroupsConfig multiplexerStack="grid.jgroups.stack"/>
+ <jgroupsConfig multiplexerStack="jcr.stack"/>
<sync />
</clustering>
<!-- Eviction configuration -->
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-lock.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-lock.xml 2010-01-28 15:45:00 UTC (rev 1614)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jbosscache-lock.xml 2010-01-28 16:45:14 UTC (rev 1615)
@@ -7,7 +7,7 @@
<clustering mode="replication" clusterName="${jbosscache-cluster-name}">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
- <jgroupsConfig multiplexerStack="grid.jgroups.stack"/>
+ <jgroupsConfig multiplexerStack="jcr.stack"/>
<sync />
</clustering>
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jcr-config.xml 2010-01-28 15:45:00 UTC (rev 1614)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jcr-config.xml 2010-01-28 16:45:14 UTC (rev 1615)
@@ -69,7 +69,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws" />
</properties>
@@ -79,7 +79,7 @@
<property name="index-dir" value="target/temp/index/db1/ws" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws" />
<property name="max-volatile-time" value="60" />
@@ -89,7 +89,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws"/>
@@ -130,7 +130,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws1" />
</properties>
@@ -140,7 +140,7 @@
<property name="index-dir" value="target/temp/index/db1/ws1" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws1" />
<property name="max-volatile-time" value="60" />
@@ -158,7 +158,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws1" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws1"/>
@@ -198,7 +198,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws2" />
</properties>
@@ -208,7 +208,7 @@
<property name="index-dir" value="target/temp/index/db1/ws2" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws2" />
<property name="max-volatile-time" value="60" />
@@ -226,7 +226,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws2" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws2"/>
@@ -285,7 +285,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws3" />
</properties>
@@ -295,7 +295,7 @@
<property name="index-dir" value="target/temp/index/db1/ws3" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws3" />
<property name="max-volatile-time" value="60" />
@@ -313,7 +313,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws3" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3"/>
@@ -372,7 +372,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws" />
</properties>
@@ -382,7 +382,7 @@
<property name="index-dir" value="target/temp/index/db1tck/ws" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws" />
<property name="max-volatile-time" value="60" />
@@ -400,7 +400,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws"/>
@@ -447,7 +447,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws1" />
</properties>
@@ -457,7 +457,7 @@
<property name="index-dir" value="target/temp/index/db1tck/ws1" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws1" />
<property name="max-volatile-time" value="60" />
@@ -473,7 +473,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws1" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws1"/>
@@ -520,7 +520,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws2" />
</properties>
@@ -530,7 +530,7 @@
<property name="index-dir" value="target/temp/index/db1tck/ws2" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws2" />
<property name="max-volatile-time" value="60" />
@@ -549,7 +549,7 @@
<properties>
<property name="time-out" value="15m" />
<property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
+ <property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws2" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws2"/>
Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp-mux.xml (from rev 1614, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp-mux.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp-mux.xml 2010-01-28 16:45:14 UTC (rev 1615)
@@ -0,0 +1,45 @@
+<protocol_stacks>
+ <stack name="jcr.stack">
+ <config>
+ <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8"
+ ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
+ mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ loopback="false" discard_incompatible_packets="true"
+ max_bundle_size="64000" max_bundle_timeout="30"
+ use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="true"
+ enable_diagnostics="true" thread_naming_pattern="cl"
+
+ use_concurrent_stack="true" thread_pool.enabled="true"
+ thread_pool.min_threads="2" thread_pool.max_threads="8"
+ thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="Run" />
+
+ <PING timeout="2000" num_initial_members="3" />
+ <MERGE2 max_interval="30000" min_interval="10000" />
+ <FD_SOCK />
+ <FD timeout="10000" max_tries="5" shun="true" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_stats_for_retransmission="false"
+ exponential_backoff="150" use_mcast_xmit="true" gc_lag="0"
+ retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" />
+ <UNICAST timeout="300,600,1200" />
+ <pbcast.STABLE stability_delay="1000"
+ desired_avg_gossip="50000" max_bytes="1000000" />
+ <VIEW_SYNC avg_send_interval="60000" />
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="false" view_bundling="true" />
+ <FC max_credits="500000" min_threshold="0.20" />
+ <FRAG2 frag_size="60000" />
+ <!--pbcast.STREAMING_STATE_TRANSFER /-->
+ <pbcast.STATE_TRANSFER />
+ <!-- pbcast.FLUSH /-->
+ </config>
+ </stack>
+</protocol_stacks>
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp-mux.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp.xml 2010-01-28 15:45:00 UTC (rev 1614)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/udp.xml 2010-01-28 16:45:14 UTC (rev 1615)
@@ -1,45 +0,0 @@
-<protocol_stacks>
- <stack name="grid.jgroups.stack">
- <config>
- <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8"
- ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
- loopback="false" discard_incompatible_packets="true"
- max_bundle_size="64000" max_bundle_timeout="30"
- use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="true"
- enable_diagnostics="true" thread_naming_pattern="cl"
-
- use_concurrent_stack="true" thread_pool.enabled="true"
- thread_pool.min_threads="2" thread_pool.max_threads="8"
- thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard"
-
- oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="Run" />
-
- <PING timeout="2000" num_initial_members="3" />
- <MERGE2 max_interval="30000" min_interval="10000" />
- <FD_SOCK />
- <FD timeout="10000" max_tries="5" shun="true" />
- <VERIFY_SUSPECT timeout="1500" />
- <BARRIER />
- <pbcast.NAKACK use_stats_for_retransmission="false"
- exponential_backoff="150" use_mcast_xmit="true" gc_lag="0"
- retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" />
- <UNICAST timeout="300,600,1200" />
- <pbcast.STABLE stability_delay="1000"
- desired_avg_gossip="50000" max_bytes="1000000" />
- <VIEW_SYNC avg_send_interval="60000" />
- <pbcast.GMS print_local_addr="true" join_timeout="3000"
- shun="false" view_bundling="true" />
- <FC max_credits="500000" min_threshold="0.20" />
- <FRAG2 frag_size="60000" />
- <!--pbcast.STREAMING_STATE_TRANSFER /-->
- <pbcast.STATE_TRANSFER />
- <!-- pbcast.FLUSH /-->
- </config>
- </stack>
-</protocol_stacks>
14 years, 3 months
exo-jcr SVN: r1614 - in jcr/trunk/exo.jcr.component.core/src/test/resources/conf: standalone and 1 other directories.
by do-not-reply@jboss.org
Author: nzamosenchuk
Date: 2010-01-28 10:45:00 -0500 (Thu, 28 Jan 2010)
New Revision: 1614
Added:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.xml
Removed:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.tpl.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.tpl.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.tpl.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/
Modified:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-configuration.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jcr-config.xml
Log:
EXOJCR-434: move templateBased configuration.
Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased (from rev 1608, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased)
Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/readme.txt 2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt 2010-01-28 15:45:00 UTC (rev 1614)
@@ -1,43 +0,0 @@
-INFO
-
-This is new, template-based configuration of JCR with JBossCache.
-This configuration uses MySQL database (sql script for creating
-and deleting all needed DBs is shown below).
-
-Currently JBossCache cluster-groups use the same "udp.xml" config
-so lots of warnings can appear on system out from JGroups.
-
-TEMPLATING
-Configuration templates should use variables like:
-"jbosscache-*" or "jgroups-configuration" any other wouldn't be
-inserted into the template.
-
-
-
-DROP DATABASE IF EXISTS portal ;
-create database portal default charset latin1 collate latin1_general_cs;
-DROP DATABASE IF EXISTS jcr ;
-create database jcr default charset latin1 collate latin1_general_cs;
-
-DROP DATABASE IF EXISTS jcr2 ;
-create database jcr2 default charset latin1 collate latin1_general_cs;
-DROP DATABASE IF EXISTS jcr3 ;
-create database jcr3 default charset latin1 collate latin1_general_cs;
-
-DROP DATABASE IF EXISTS jcrtest ;
-create database jcrtest default charset latin1 collate latin1_general_cs;
-DROP DATABASE IF EXISTS portaltck ;
-create database portaltck default charset latin1 collate latin1_general_cs;
-
-DROP DATABASE IF EXISTS jcrtck ;
-create database jcrtck default charset latin1 collate latin1_general_cs;
-DROP DATABASE IF EXISTS jcr2tck;
-create database jcr2tck default charset latin1 collate latin1_general_cs;
-
-DROP DATABASE IF EXISTS jdbcjcr2export1 ;
-create database jdbcjcr2export1 default charset latin1 collate latin1_general_cs;
-DROP DATABASE IF EXISTS jdbcjcr2export2 ;
-create database jdbcjcr2export2 default charset latin1 collate latin1_general_cs;
-
-DROP DATABASE IF EXISTS jdbcjcr2export3 ;
-create database jdbcjcr2export3 default charset latin1 collate latin1_general_cs;
Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt (from rev 1611, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/readme.txt)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/readme.txt 2010-01-28 15:45:00 UTC (rev 1614)
@@ -0,0 +1,42 @@
+DEPRECATED, use multiplexer-based configuration!
+
+INFO
+
+This is new, template-based configuration of JCR with JBossCache.
+This configuration uses MySQL database (sql script for creating
+and deleting all needed DBs is shown below).
+
+TEMPLATING
+Configuration templates should use variables like:
+"jbosscache-*" or "jgroups-configuration" any other wouldn't be
+inserted into the template.
+
+
+
+DROP DATABASE IF EXISTS portal ;
+create database portal default charset latin1 collate latin1_general_cs;
+DROP DATABASE IF EXISTS jcr ;
+create database jcr default charset latin1 collate latin1_general_cs;
+
+DROP DATABASE IF EXISTS jcr2 ;
+create database jcr2 default charset latin1 collate latin1_general_cs;
+DROP DATABASE IF EXISTS jcr3 ;
+create database jcr3 default charset latin1 collate latin1_general_cs;
+
+DROP DATABASE IF EXISTS jcrtest ;
+create database jcrtest default charset latin1 collate latin1_general_cs;
+DROP DATABASE IF EXISTS portaltck ;
+create database portaltck default charset latin1 collate latin1_general_cs;
+
+DROP DATABASE IF EXISTS jcrtck ;
+create database jcrtck default charset latin1 collate latin1_general_cs;
+DROP DATABASE IF EXISTS jcr2tck;
+create database jcr2tck default charset latin1 collate latin1_general_cs;
+
+DROP DATABASE IF EXISTS jdbcjcr2export1 ;
+create database jdbcjcr2export1 default charset latin1 collate latin1_general_cs;
+DROP DATABASE IF EXISTS jdbcjcr2export2 ;
+create database jdbcjcr2export2 default charset latin1 collate latin1_general_cs;
+
+DROP DATABASE IF EXISTS jdbcjcr2export3 ;
+create database jdbcjcr2export3 default charset latin1 collate latin1_general_cs;
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-configuration.xml 2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-configuration.xml 2010-01-28 15:45:00 UTC (rev 1614)
@@ -171,7 +171,7 @@
<value-param>
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/templateBased/test-jcr-config.xml</value>
+ <value>jar:/conf/standalone/templateBased/test-jcr-config.xml</value>
</value-param>
<!-- properties-param>
<name>working-conf</name>
Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.tpl.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-data.tpl.xml 2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.tpl.xml 2010-01-28 15:45:00 UTC (rev 1614)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000"
- lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" />
- <jgroupsConfig configFile="${jgroups-configuration}" />
- <sync />
- </clustering>
-
- <!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
- eventQueueSize="1000000">
- <property name="maxNodes" value="10000" />
- <property name="timeToLive" value="120000" />
- </default>
- </eviction>
-</jbosscache>
\ No newline at end of file
Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.xml (from rev 1608, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-data.tpl.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.xml 2010-01-28 15:45:00 UTC (rev 1614)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="50000"
+ lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig configFile="${jgroups-configuration}" />
+ <sync />
+ </clustering>
+
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="10000" />
+ <property name="timeToLive" value="120000" />
+ </default>
+ </eviction>
+</jbosscache>
\ No newline at end of file
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-data.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.tpl.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-indexer.tpl.xml 2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.tpl.xml 2010-01-28 15:45:00 UTC (rev 1614)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000"
- lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
- <!-- Configure the TransactionManager -->
- <transaction
- transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
-
- <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" />
- <jgroupsConfig configFile="${jgroups-configuration}" />
- <sync />
- </clustering>
- <!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm"
- eventQueueSize="1000000">
- <property name="maxNodes" value="10000" />
- <property name="minTimeToLive" value="60000" />
- </default>
- </eviction>
-
-</jbosscache>
Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.xml (from rev 1608, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-indexer.tpl.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.xml 2010-01-28 15:45:00 UTC (rev 1614)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="50000"
+ lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+ <!-- Configure the TransactionManager -->
+ <transaction
+ transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig configFile="${jgroups-configuration}" />
+ <sync />
+ </clustering>
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="10000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-indexer.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.tpl.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-lock.tpl.xml 2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.tpl.xml 2010-01-28 15:45:00 UTC (rev 1614)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.2">
-
- <locking useLockStriping="false" concurrencyLevel="50000"
- lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
- <stateRetrieval timeout="20000" fetchInMemoryState="false" />
- <jgroupsConfig configFile="${jgroups-configuration}" />
- <sync />
- </clustering>
-
- <loaders passivation="false" shared="true">
- <preload>
- <node fqn="/" />
- </preload>
- <!--
- For another cache-loader class you should use another template with
- cache-loader specific parameters
- -->
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false"
- fetchPersistentState="false" ignoreModifications="false"
- purgeOnStartup="false">
- <properties>
- cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
- cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
- cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
- cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
- cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
- cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
- cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
- cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
- cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
- cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
- </properties>
- </loader>
-
- </loaders>
-
-</jbosscache>
Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.xml (from rev 1608, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jbosscache-lock.tpl.xml)
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.xml 2010-01-28 15:45:00 UTC (rev 1614)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:jboss:jbosscache-core:config:3.2">
+
+ <locking useLockStriping="false" concurrencyLevel="50000"
+ lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig configFile="${jgroups-configuration}" />
+ <sync />
+ </clustering>
+
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <!--
+ For another cache-loader class you should use another template with
+ cache-loader specific parameters
+ -->
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false"
+ fetchPersistentState="false" ignoreModifications="false"
+ purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
+ cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
+ cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
+ cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
+ cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
+ cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
+ cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
+ cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
+ cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
+ cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
+ </properties>
+ </loader>
+
+ </loaders>
+
+</jbosscache>
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jbosscache-lock.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/test-jcr-config.xml 2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/templateBased/test-jcr-config.xml 2010-01-28 15:45:00 UTC (rev 1614)
@@ -68,8 +68,8 @@
-->
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1-ws.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1-ws.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws" />
</properties>
</cache>
@@ -77,8 +77,8 @@
<properties>
<property name="index-dir" value="target/temp/index/db1/ws" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1-ws.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1-ws.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws" />
<property name="max-volatile-time" value="60" />
</properties>
@@ -86,8 +86,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1-ws.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1-ws.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws"/>
<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -126,8 +126,8 @@
</container>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1-ws1.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1-ws1.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws1" />
</properties>
</cache>
@@ -135,15 +135,15 @@
<properties>
<property name="index-dir" value="target/temp/index/db1/ws1" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1-ws1.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1-ws1.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws1" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="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" />
@@ -152,8 +152,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1-ws1.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1-ws1.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws1" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws1"/>
<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -191,8 +191,8 @@
</container>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1-ws2.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1-ws2.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws2" />
</properties>
</cache>
@@ -200,15 +200,15 @@
<properties>
<property name="index-dir" value="target/temp/index/db1/ws2" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1-ws2.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1-ws2.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws2" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="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" />
@@ -217,8 +217,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1-ws2.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1-ws2.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws2" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws2"/>
<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -275,8 +275,8 @@
</container>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1-ws3.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1-ws3.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws3" />
</properties>
</cache>
@@ -284,15 +284,15 @@
<properties>
<property name="index-dir" value="target/temp/index/db1/ws3" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1-ws3.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1-ws3.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws3" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="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" />
@@ -301,8 +301,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1-ws3.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1-ws3.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws3" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3"/>
<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -359,8 +359,8 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1tck-ws.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1tck-ws.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws" />
</properties>
</cache>
@@ -368,15 +368,15 @@
<properties>
<property name="index-dir" value="target/temp/index/db1tck/ws" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1tck-ws.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1tck-ws.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="indexing-configuration-path" value="../../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
<property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" />
<property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
@@ -385,8 +385,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1tck-ws.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1tck-ws.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws"/>
<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -431,8 +431,8 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1tck-ws1.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1tck-ws1.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws1" />
</properties>
</cache>
@@ -440,14 +440,14 @@
<properties>
<property name="index-dir" value="target/temp/index/db1tck/ws1" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1tck-ws1.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1tck-ws1.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws1" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="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>
@@ -455,8 +455,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1tck-ws1.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1tck-ws1.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws1" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws1"/>
<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
@@ -501,8 +501,8 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-data.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-data-db1tck-ws2.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-data-db1tck-ws2.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws2" />
</properties>
</cache>
@@ -510,14 +510,14 @@
<properties>
<property name="index-dir" value="target/temp/index/db1tck/ws2" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-indexer.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-index-db1tck-ws2.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-index-db1tck-ws2.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws2" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="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" />
<property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"/>
@@ -528,8 +528,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/templateBased/test-jbosscache-lock.tpl.xml" />
- <property name="jgroups-configuration" value="conf/templateBased/tcp-lock-db1tck-ws2.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/templateBased/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/templateBased/tcp-lock-db1tck-ws2.xml" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws2" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws2"/>
<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
14 years, 3 months
exo-jcr SVN: r1613 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas.
by do-not-reply@jboss.org
Author: pnedonosko
Date: 2010-01-28 10:42:44 -0500 (Thu, 28 Jan 2010)
New Revision: 1613
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java
Log:
EXOJCR-310 codeformat
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2010-01-28 15:36:23 UTC (rev 1612)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2010-01-28 15:42:44 UTC (rev 1613)
@@ -88,8 +88,8 @@
/**
* MYSQL_PK_CONSTRAINT_DETECT.
*/
- private static final Pattern MYSQL_PK_CONSTRAINT_DETECT =
- Pattern.compile(MYSQL_PK_CONSTRAINT_DETECT_PATTERN, Pattern.CASE_INSENSITIVE);
+ private static final Pattern MYSQL_PK_CONSTRAINT_DETECT = Pattern.compile(MYSQL_PK_CONSTRAINT_DETECT_PATTERN,
+ Pattern.CASE_INSENSITIVE);
/**
* DB2_PK_CONSTRAINT_DETECT_PATTERN.
@@ -155,7 +155,7 @@
this.dialect = dialect;
// init database metadata
- final String tn = props.getProperty(TABLE_NAME_PARAM);
+ String tn = props.getProperty(TABLE_NAME_PARAM);
if (tn != null)
{
tableName = tn;
@@ -278,8 +278,10 @@
// check is it a primary key vioaltion or smth else
// if primary key - it's record already exists issue, VCAS error otherwise.
if (isRecordAlreadyExistsException(e))
+ {
throw new RecordAlreadyExistsException("Record already exists, propertyId=" + propertyId + " orderNum="
+ orderNum + ". Error: " + e, e);
+ }
throw new VCASException("VCAS ADD database error: " + e, e);
}
@@ -345,7 +347,9 @@
ps.close();
if (res <= 0)
+ {
throw new RecordNotFoundException("Record not found, propertyId=" + propertyId);
+ }
}
finally
{
@@ -375,8 +379,10 @@
ps.close();
if (res <= 0)
+ {
throw new RecordNotFoundException("Value record not found, propertyId=" + propertyId + " orderNumb="
+ orderNumb);
+ }
}
finally
{
@@ -409,8 +415,10 @@
return rs.getString("CAS_ID");
}
else
+ {
throw new RecordNotFoundException("No record found with propertyId=" + propertyId + " orderNum="
+ orderNum);
+ }
}
finally
{
@@ -453,7 +461,9 @@
return ids;
}
else
+ {
throw new RecordNotFoundException("No records found with propertyId=" + propertyId);
+ }
}
else
{
@@ -471,7 +481,9 @@
return ids;
}
else
+ {
throw new RecordNotFoundException("No records found with propertyId=" + propertyId);
+ }
}
}
finally
14 years, 3 months
exo-jcr SVN: r1612 - in jcr/trunk/exo.jcr.component.core/src/test/resources/conf: standalone and 1 other directories.
by do-not-reply@jboss.org
Author: nzamosenchuk
Date: 2010-01-28 10:36:23 -0500 (Thu, 28 Jan 2010)
New Revision: 1612
Added:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/
Removed:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/
Modified:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-configuration.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jcr-config.xml
Log:
EXOJCR-425: move mux configuration.
Copied: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux (from rev 1611, jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux)
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-configuration.xml 2010-01-28 15:19:27 UTC (rev 1611)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-configuration.xml 2010-01-28 15:36:23 UTC (rev 1612)
@@ -171,7 +171,7 @@
<value-param>
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>jar:/conf/mux/test-jcr-config.xml</value>
+ <value>jar:/conf/standalone/mux/test-jcr-config.xml</value>
</value-param>
<!-- properties-param>
<name>working-conf</name>
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jcr-config.xml 2010-01-28 15:19:27 UTC (rev 1611)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mux/test-jcr-config.xml 2010-01-28 15:36:23 UTC (rev 1612)
@@ -68,8 +68,8 @@
-->
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws" />
</properties>
@@ -78,8 +78,8 @@
<properties>
<property name="index-dir" value="target/temp/index/db1/ws" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws" />
<property name="max-volatile-time" value="60" />
@@ -88,8 +88,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws"/>
@@ -129,8 +129,8 @@
</container>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws1" />
</properties>
@@ -139,16 +139,16 @@
<properties>
<property name="index-dir" value="target/temp/index/db1/ws1" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws1" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="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" />
@@ -157,8 +157,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws1" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws1"/>
@@ -197,8 +197,8 @@
</container>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws2" />
</properties>
@@ -207,16 +207,16 @@
<properties>
<property name="index-dir" value="target/temp/index/db1/ws2" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws2" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="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" />
@@ -225,8 +225,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws2" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws2"/>
@@ -284,8 +284,8 @@
</container>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws3" />
</properties>
@@ -294,16 +294,16 @@
<properties>
<property name="index-dir" value="target/temp/index/db1/ws3" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws3" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="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" />
@@ -312,8 +312,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws3" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws3"/>
@@ -371,8 +371,8 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws" />
</properties>
@@ -381,16 +381,16 @@
<properties>
<property name="index-dir" value="target/temp/index/db1tck/ws" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="indexing-configuration-path" value="../../../indexing-configuration.xml" />
<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
<property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" />
<property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" />
@@ -399,8 +399,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws"/>
@@ -446,8 +446,8 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws1" />
</properties>
@@ -456,15 +456,15 @@
<properties>
<property name="index-dir" value="target/temp/index/db1tck/ws1" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws1" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="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>
@@ -472,8 +472,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws1" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws1"/>
@@ -519,8 +519,8 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws2" />
</properties>
@@ -529,15 +529,15 @@
<properties>
<property name="index-dir" value="target/temp/index/db1tck/ws2" />
<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws2" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
- <property name="synonymprovider-config-path" value="../../synonyms.properties" />
+ <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="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" />
<property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"/>
@@ -548,8 +548,8 @@
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
- <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jbosscache-configuration" value="conf/standalone/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/standalone/mux/udp.xml" />
<property name="jgroups-multiplexer-stack" value="true" />
<property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws2" />
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws2"/>
14 years, 3 months
exo-jcr SVN: r1611 - in jcr/trunk/exo.jcr.component.core/src/test/resources/conf: mux and 1 other directories.
by do-not-reply@jboss.org
Author: nzamosenchuk
Date: 2010-01-28 10:19:27 -0500 (Thu, 28 Jan 2010)
New Revision: 1611
Added:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-configuration.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-data.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-indexer.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-lock.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jcr-config.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/udp.xml
Modified:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/readme.txt
Log:
EXOJCR-425: Added multiplexing configuration for JCR (using udp).
Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-configuration.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-configuration.xml 2010-01-28 15:19:27 UTC (rev 1611)
@@ -0,0 +1,625 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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.
+
+-->
+<configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
+ <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
+ <init-params>
+ <value-param>
+ <name>logger</name>
+ <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value>
+ </value-param>
+ <value-param>
+ <name>configurator</name>
+ <value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
+ </value-param>
+ <properties-param>
+ <name>properties</name>
+ <description>Log4J properties</description>
+ <property name="log4j.rootLogger" value="INFO, stdout, file"/>
+
+ <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/>
+ <property name="log4j.appender.stdout.threshold" value="DEBUG"/>
+
+ <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/>
+ <property name="log4j.appender.stdout.layout.ConversionPattern"
+ value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/>
+
+ <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/>
+ <property name="log4j.appender.file.File" value="target/jcr.log"/>
+
+ <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/>
+ <property name="log4j.appender.file.layout.ConversionPattern"
+ value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/>
+
+ <property name="log4j.category.jcr.JBossCacheStorageConnection1" value="DEBUG"/>
+
+ <!-- property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ -->
+ </properties-param>
+
+ <!-- value-param>
+ <name>logger</name>
+ <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value>
+ </value-param>
+ <value-param>
+ <name>configurator</name>
+ <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value>
+ </value-param>
+ <properties-param>
+ <name>properties</name>
+ <description>SimpleLog properties</description>
+ <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/>
+ <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/>
+ </properties-param -->
+
+ <!-- value-param>
+ <name>logger</name>
+ <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value>
+ </value-param>
+ <value-param>
+ <name>configurator</name>
+ <value>org.exoplatform.services.log.impl.Jdk14Configurator</value>
+ </value-param>
+ <properties-param>
+ <name>properties</name>
+ <description>jdk1.4 Logger properties</description>
+ <property name="handlers" value="java.util.logging.ConsoleHandler"/>
+ <property name=".level" value="FINE"/>
+ <property name="java.util.logging.ConsoleHandler.level" value="FINE"/>
+ </properties-param -->
+
+ </init-params>
+ </component>
+
+ <!-- component>
+ <type>org.exoplatform.services.jbosscache.JBossCacheService</type>
+ <init-params>
+ <value-param>
+ <name>jbosscache-configuration</name>
+ <value>conf/portal/exojcr-jboss-cache-conf.xml</value>
+ </value-param>
+ </init-params>
+ </component -->
+
+ <component>
+ <key>org.exoplatform.services.jcr.RepositoryService</key>
+ <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type>
+ <component-plugins>
+ <component-plugin>
+ <name>add.namespaces</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
+ <init-params>
+ <properties-param>
+ <name>namespaces</name>
+ <property name="test" value="http://www.apache.org/jackrabbit/test"/>
+ <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/>
+ <property name="rma" value="http://www.rma.com/jcr/"/>
+ <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/>
+ <property name="dc" value="http://purl.org/dc/elements/1.1/"/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>add.nodeType</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
+ <init-params>
+ <values-param>
+ <name>autoCreatedInNewRepository</name>
+ <description>Node types configuration file</description>
+ <value>jar:/conf/test/nodetypes-tck.xml</value>
+ <value>jar:/conf/test/nodetypes-impl.xml</value>
+ <value>jar:/conf/test/nodetypes-usecase.xml</value>
+ <value>jar:/conf/test/nodetypes-config.xml</value>
+ <value>jar:/conf/test/nodetypes-config-extended.xml</value>
+ </values-param>
+
+ <values-param>
+ <name>testInitNodeTypesRepository</name>
+ <description>
+ Node types configuration file for repository with name testInitNodeTypesRepository
+ </description>
+ <value>jar:/conf/test/nodetypes-test.xml</value>
+ </values-param>
+
+ <values-param>
+ <name>testInitNodeTypesRepositoryTest2</name>
+ <description>
+ Node types configuration file for repository with name testInitNodeTypesRepositoryTest2
+ </description>
+ <value>jar:/conf/test/nodetypes-test2.xml</value>
+ </values-param>
+
+ <!--values-param>
+ <name>testInitNodeTypesRepositoryTest3</name>
+ <description>Node types from ext. Needed bacause core starup earlie than ext</description>
+ <value>jar:/conf/test/nodetypes-test3_ext.xml</value>
+ </values-param-->
+
+ </init-params>
+ </component-plugin>
+ </component-plugins>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
+ <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
+ <init-params>
+ <value-param>
+ <name>conf-path</name>
+ <description>JCR configuration file</description>
+ <value>jar:/conf/mux/test-jcr-config.xml</value>
+ </value-param>
+ <!-- properties-param>
+ <name>working-conf</name>
+ <description>working-conf</description>
+ <property name="source-name" value="jdbcjcr"/>
+ <property name="dialect" value="mysql"/>
+ <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/>
+ </properties-param -->
+ </init-params>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.security.Authenticator</key>
+ <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+ </component>
+
+ <component>
+ <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type>
+ </component>
+
+ <component>
+ <key>org.jboss.cache.transaction.TransactionManagerLookup</key>
+ <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.services.transaction.TransactionService</key>
+ <type>org.exoplatform.services.transaction.jbosscache.ArjunaTransactionService</type>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>300</value>
+ </value-param>
+ </init-params>
+ </component>
+
+ <!-- component>
+ <key>org.exoplatform.services.transaction.TransactionService</key>
+ <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>5</value>
+ </value-param>
+ </init-params>
+ </component-->
+
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
+ <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</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="com.mysql.jdbc.Driver" />
+ <property name="url" value="jdbc:mysql://localhost/portal"/>
+ <property name="username" value="root"/>
+ <property name="password" value="admin"/>
+ <property name="maxActive" value="100" />
+ <property name="maxIdle" value="5" />
+ <property name="initialSize" value="5" />
+ </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>jdbcjcr1</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="com.mysql.jdbc.Driver" />
+ <property name="url" value="jdbc:mysql://localhost/jcr"/>
+ <property name="username" value="root"/>
+ <property name="password" value="admin"/>
+ <property name="maxActive" value="100" />
+ <property name="maxIdle" value="5" />
+ <property name="initialSize" value="5" />
+ </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>jdbcjcr2</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="com.mysql.jdbc.Driver" />
+ <property name="url" value="jdbc:mysql://localhost/jcr2"/>
+ <property name="username" value="root"/>
+ <property name="password" value="admin"/>
+ <property name="maxActive" value="100" />
+ <property name="maxIdle" value="5" />
+ <property name="initialSize" value="5" />
+ </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>
+ <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="com.mysql.jdbc.Driver" />
+ <property name="url" value="jdbc:mysql://localhost/jcr3"/>
+ <property name="username" value="root"/>
+ <property name="password" value="admin"/>
+ <property name="maxActive" value="100" />
+ <property name="maxIdle" value="5" />
+ <property name="initialSize" value="5" />
+ </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>jdbcjcrtest</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/jcrtest"/>
+ <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>jdbcjcrtck</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="com.mysql.jdbc.Driver" />
+ <property name="url" value="jdbc:mysql://localhost/portaltck"/>
+ <property name="username" value="root"/>
+ <property name="password" value="admin"/>
+ <property name="maxActive" value="100" />
+ <property name="maxIdle" value="5" />
+ <property name="initialSize" value="5" />
+ </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>jdbcjcr1tck</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="com.mysql.jdbc.Driver" />
+ <property name="url" value="jdbc:mysql://localhost/jcrtck"/>
+ <property name="username" value="root"/>
+ <property name="password" value="admin"/>
+ <property name="maxActive" value="100" />
+ <property name="maxIdle" value="5" />
+ <property name="initialSize" value="5" />
+ </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>jdbcjcr2tck</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="com.mysql.jdbc.Driver" />
+ <property name="url" value="jdbc:mysql://localhost/jcr2tck"/>
+ <property name="username" value="root"/>
+ <property name="password" value="admin"/>
+ <property name="maxActive" value="100" />
+ <property name="maxIdle" value="5" />
+ <property name="initialSize" value="5" />
+ </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>jdbcjcr2export1</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/jdbcjcr2export1"/>
+ <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>jdbcjcr2export2</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/jdbcjcr2export2"/>
+ <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>jdbcjcr2export3</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/jdbcjcr2export3"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+
+
+ <!-- Resource configuration for UserTransaction
+ use JOTM
+ -->
+ <component-plugin>
+ <name>jotm.tx</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>UserTransaction</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.transaction.UserTransaction</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.objectweb.jotm.UserTransactionFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="jotm.timeout" value="60"/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>bind.jcr</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>repo</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.jcr.Repository</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="repositoryName" value="db1"/>
+ <!-- property name="containerConfig" value="exo-configuration.xml"/ -->
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>rmi.jcr</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>rmirepository</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.jcr.Repository</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="url" value="//localhost:9999/repository"/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-configuration.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-data.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-data.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-data.xml 2010-01-28 15:19:27 UTC (rev 1611)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="50000"
+ lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig multiplexerStack="grid.jgroups.stack"/>
+ <sync />
+ </clustering>
+
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="10000" />
+ <property name="timeToLive" value="120000" />
+ </default>
+ </eviction>
+</jbosscache>
\ No newline at end of file
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-data.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-indexer.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-indexer.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-indexer.xml 2010-01-28 15:19:27 UTC (rev 1611)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="50000"
+ lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+ <!-- Configure the TransactionManager -->
+ <transaction
+ transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig multiplexerStack="grid.jgroups.stack"/>
+ <sync />
+ </clustering>
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="10000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-indexer.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-lock.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-lock.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-lock.xml 2010-01-28 15:19:27 UTC (rev 1611)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:jboss:jbosscache-core:config:3.2">
+
+ <locking useLockStriping="false" concurrencyLevel="50000"
+ lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" />
+ <jgroupsConfig multiplexerStack="grid.jgroups.stack"/>
+ <sync />
+ </clustering>
+
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <!--
+ For another cache-loader class you should use another template with
+ cache-loader specific parameters
+ -->
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false"
+ fetchPersistentState="false" ignoreModifications="false"
+ purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
+ cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
+ cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
+ cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
+ cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
+ cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
+ cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
+ cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
+ cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
+ cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
+ </properties>
+ </loader>
+
+ </loaders>
+
+</jbosscache>
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jbosscache-lock.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jcr-config.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jcr-config.xml 2010-01-28 15:19:27 UTC (rev 1611)
@@ -0,0 +1,571 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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.
+
+-->
+<repository-service default-repository="db1">
+ <repositories>
+ <repository name="db1" system-workspace="ws" default-workspace="ws">
+ <security-domain>exo-domain</security-domain>
+ <!-- access-control>optional</access-control -->
+ <!-- access-control>disable</access-control -->
+ <session-max-age>1h</session-max-age>
+ <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
+ <workspaces>
+ <workspace name="ws">
+ <!-- for system storage -->
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcjcr" />
+ <property name="dialect" value="mysql" />
+ <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/ws" />
+ </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/ws" />
+ <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="mysql" />
+ </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>
+ <!-- initializer class="org.exoplatform.services.jcr.impl.core.RestoreWorkspaceInitializer">
+ <properties>
+ <property name="restore-path" value="./sv_export_root.xml" />
+ <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">
+ <properties>
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws" />
+ </properties>
+ </cache>
+ <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.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws" />
+ <property name="max-volatile-time" value="60" />
+ </properties>
+ </query-handler>
+ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws"/>
+ <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_ws_pk"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>
+ </properties>
+ </lock-manager>
+ </workspace>
+
+ <workspace name="ws1">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcjcr1" />
+ <property name="dialect" value="mysql" />
+ <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/ws1" />
+ </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/ws1" />
+ </properties>
+ <filters>
+ <filter property-type="Binary" />
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <properties>
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws1" />
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="target/temp/index/db1/ws1" />
+ <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws1" />
+ <property name="max-volatile-time" value="60" />
+
+ <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.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws1" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws1"/>
+ <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_ws1_pk"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/> </properties>
+ </lock-manager>
+ </workspace>
+
+ <workspace name="ws2" lazy-read-threshold="1">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcjcr2" />
+ <property name="dialect" value="mysql" />
+ <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/ws2" />
+ </properties>
+ <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" />
+ </properties>
+ <filters>
+ <filter property-type="Binary" />
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <properties>
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws2" />
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="target/temp/index/db1/ws2" />
+ <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws2" />
+ <property name="max-volatile-time" value="60" />
+
+ <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.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws2" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1_ws2"/>
+ <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_ws2_pk"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>
+ </properties>
+ </lock-manager>
+ </workspace>
+
+ <workspace name="ws3">
+ <!-- for system storage -->
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcjcr3" />
+ <property name="dialect" value="mysql" />
+ <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>
+ <!--
+ 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">
+ <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" />
+ <property name="jdbc-dialect" value="hsqldb" />
+ </properties>
+ <filters>
+ <filter property-type="Binary" />
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <properties>
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-db1-ws3" />
+ </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="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1-ws3" />
+ <property name="max-volatile-time" value="60" />
+
+ <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.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1-ws3" />
+ <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.fqn.type" value="VARCHAR(512)"/>
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+ <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>
+
+ <repository name="db1tck" system-workspace="ws" default-workspace="ws">
+ <security-domain>exo-domain</security-domain>
+ <!-- access-control>optional</access-control -->
+ <!-- access-control>disable</access-control -->
+ <session-max-age>1h</session-max-age>
+ <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
+ <workspaces>
+ <workspace name="ws">
+ <!-- for system storage -->
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcjcrtck" />
+ <property name="dialect" value="mysql" />
+ <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/wstck" />
+ </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/wstck" />
+ </properties>
+ <filters>
+ <filter property-type="Binary" min-value-size="100K" />
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured" />
+ <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">
+ <properties>
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws" />
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="target/temp/index/db1tck/ws" />
+ <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws" />
+ <property name="max-volatile-time" value="60" />
+
+ <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="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" />
+ <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.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws"/>
+ <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_db1tck_ws_pk"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>
+ </properties>
+ </lock-manager>
+ </workspace>
+
+ <workspace name="ws1">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcjcr1tck" />
+ <property name="dialect" value="mysql" />
+ <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/ws1tck" />
+ </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/ws1tck" />
+ </properties>
+ <filters>
+ <filter property-type="Binary" min-value-size="100K" />
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured" />
+ <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">
+ <properties>
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws1" />
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="target/temp/index/db1tck/ws1" />
+ <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws1" />
+ <property name="max-volatile-time" value="60" />
+ <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.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws1" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws1"/>
+ <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_db1tck_ws1_pk"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+ <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/>
+ </properties>
+ </lock-manager>
+ </workspace>
+
+ <workspace name="ws2">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcjcr2tck" />
+ <property name="dialect" value="mysql" />
+ <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/ws2tck" />
+ </properties>
+ <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" />
+ </properties>
+ <filters>
+ <filter property-type="Binary" min-value-size="100K" />
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured" />
+ <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">
+ <properties>
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-data.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-db1tck-ws2" />
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="target/temp/index/db1tck/ws2" />
+ <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-indexer.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-db1tck-ws2" />
+ <property name="max-volatile-time" value="60" />
+ <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" />
+ <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"/>
+ <property name="extractorPoolSize" value="2"/>
+ <property name="extractorTimeout" value="10"/>
+ </properties>
+ </query-handler>
+ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/mux/test-jbosscache-lock.xml" />
+ <property name="jgroups-configuration" value="conf/mux/udp.xml" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="JCR-cluster-locks-db1tck-ws2" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_db1tck_ws2"/>
+ <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_db1tck_ws2_pk"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
+ <property name="jbosscache-cl-cache.jdbc.fqn.type" value="VARCHAR(512)"/>
+ <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
+ <property name="jbosscache-cl-cache.jdbc.node.type" value="LONGBLOB"/>
+ <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>
+ </repositories>
+</repository-service>
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/test-jcr-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/udp.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/udp.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/udp.xml 2010-01-28 15:19:27 UTC (rev 1611)
@@ -0,0 +1,45 @@
+<protocol_stacks>
+ <stack name="grid.jgroups.stack">
+ <config>
+ <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8"
+ ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
+ mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ loopback="false" discard_incompatible_packets="true"
+ max_bundle_size="64000" max_bundle_timeout="30"
+ use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="true"
+ enable_diagnostics="true" thread_naming_pattern="cl"
+
+ use_concurrent_stack="true" thread_pool.enabled="true"
+ thread_pool.min_threads="2" thread_pool.max_threads="8"
+ thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard"
+
+ oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="Run" />
+
+ <PING timeout="2000" num_initial_members="3" />
+ <MERGE2 max_interval="30000" min_interval="10000" />
+ <FD_SOCK />
+ <FD timeout="10000" max_tries="5" shun="true" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <BARRIER />
+ <pbcast.NAKACK use_stats_for_retransmission="false"
+ exponential_backoff="150" use_mcast_xmit="true" gc_lag="0"
+ retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" />
+ <UNICAST timeout="300,600,1200" />
+ <pbcast.STABLE stability_delay="1000"
+ desired_avg_gossip="50000" max_bytes="1000000" />
+ <VIEW_SYNC avg_send_interval="60000" />
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ shun="false" view_bundling="true" />
+ <FC max_credits="500000" min_threshold="0.20" />
+ <FRAG2 frag_size="60000" />
+ <!--pbcast.STREAMING_STATE_TRANSFER /-->
+ <pbcast.STATE_TRANSFER />
+ <!-- pbcast.FLUSH /-->
+ </config>
+ </stack>
+</protocol_stacks>
Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/mux/udp.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/readme.txt
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/readme.txt 2010-01-28 15:06:59 UTC (rev 1610)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/templateBased/readme.txt 2010-01-28 15:19:27 UTC (rev 1611)
@@ -1,3 +1,5 @@
+DEPRECATED, use multiplexer-based configuration!
+
INFO
This is new, template-based configuration of JCR with JBossCache.
@@ -4,9 +6,6 @@
This configuration uses MySQL database (sql script for creating
and deleting all needed DBs is shown below).
-Currently JBossCache cluster-groups use the same "udp.xml" config
-so lots of warnings can appear on system out from JGroups.
-
TEMPLATING
Configuration templates should use variables like:
"jbosscache-*" or "jgroups-configuration" any other wouldn't be
14 years, 3 months
exo-jcr SVN: r1610 - in jcr/trunk/exo.jcr.component.core/src/main: java/org/exoplatform/services/jcr/config and 5 other directories.
by do-not-reply@jboss.org
Author: nzamosenchuk
Date: 2010-01-28 10:06:59 -0500 (Thu, 28 Jan 2010)
New Revision: 1610
Added:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/LockManagerEntry.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
jcr/trunk/exo.jcr.component.core/src/main/resources/binding.xml
Log:
EXOJCR-425: Support of multiplexing added by using ExoCacheFactory that is responsible pre-configured for cache creation. Also parameter (attribute-like parameter) <jbosscacheConfig> from LockManagerEntry. JBossCache configuration should only be provided by <property name="jbosscache-configuration" value="path/to/file">.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/LockManagerEntry.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/LockManagerEntry.java 2010-01-28 14:43:45 UTC (rev 1609)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/LockManagerEntry.java 2010-01-28 15:06:59 UTC (rev 1610)
@@ -29,8 +29,6 @@
private LockPersisterEntry persister;
- private String cacheConfig;
-
public long getTimeout()
{
return timeout;
@@ -51,14 +49,4 @@
this.persister = persister;
}
- public String getCacheConfig()
- {
- return cacheConfig;
- }
-
- public void steCacheConfig(String cacheConfig)
- {
- this.cacheConfig = cacheConfig;
- }
-
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-28 14:43:45 UTC (rev 1609)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-28 15:06:59 UTC (rev 1610)
@@ -24,7 +24,6 @@
import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.SimpleParameterEntry;
-import org.exoplatform.services.jcr.config.TemplateConfigurationHelper;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.dataflow.ChangesLogIterator;
import org.exoplatform.services.jcr.dataflow.CompositeChangesLog;
@@ -48,21 +47,18 @@
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager;
import org.exoplatform.services.jcr.impl.storage.JCRInvalidItemStateException;
+import org.exoplatform.services.jcr.jbosscache.ExoJBossCacheFactory;
import org.exoplatform.services.jcr.observation.ExtendedEvent;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.naming.InitialContextInitializer;
import org.exoplatform.services.transaction.TransactionService;
import org.jboss.cache.Cache;
-import org.jboss.cache.CacheFactory;
-import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
import org.jboss.cache.loader.CacheLoader;
import org.picocontainer.Startable;
-import java.io.IOException;
-import java.io.InputStream;
import java.io.Serializable;
import java.math.BigInteger;
import java.security.MessageDigest;
@@ -185,7 +181,8 @@
* @throws RepositoryConfigurationException
*/
public CacheableLockManager(WorkspacePersistentDataManager dataManager, WorkspaceEntry config,
- InitialContextInitializer context, TransactionService transactionService,ConfigurationManager cfm) throws RepositoryConfigurationException
+ InitialContextInitializer context, TransactionService transactionService, ConfigurationManager cfm)
+ throws RepositoryConfigurationException
{
this(dataManager, config, context, transactionService.getTransactionManager(), cfm);
}
@@ -199,9 +196,9 @@
* @throws RepositoryConfigurationException
*/
public CacheableLockManager(WorkspacePersistentDataManager dataManager, WorkspaceEntry config,
- InitialContextInitializer context,ConfigurationManager cfm) throws RepositoryConfigurationException
+ InitialContextInitializer context, ConfigurationManager cfm) throws RepositoryConfigurationException
{
- this(dataManager, config, context, (TransactionManager)null,cfm);
+ this(dataManager, config, context, (TransactionManager)null, cfm);
}
/**
@@ -215,7 +212,8 @@
* @throws RepositoryConfigurationException
*/
public CacheableLockManager(WorkspacePersistentDataManager dataManager, WorkspaceEntry config,
- InitialContextInitializer context, TransactionManager transactionManager, ConfigurationManager cfm) throws RepositoryConfigurationException
+ InitialContextInitializer context, TransactionManager transactionManager, ConfigurationManager cfm)
+ throws RepositoryConfigurationException
{
lockRoot = Fqn.fromElements(LOCKS);
@@ -248,38 +246,16 @@
dataManager.addItemPersistenceListener(this);
// make cache
- if (config.getLockManager() != null
- && (config.getLockManager().getCacheConfig() != null || (paramenerts != null && config.getLockManager()
- .getParameterValue(JBOSSCACCHE_CONFIG, null) != null)))
+ if (config.getLockManager() != null)
{
- String jbcConfig =
- (paramenerts != null && config.getLockManager().getParameterValue(JBOSSCACCHE_CONFIG, null) != null)
- ? config.getLockManager().getParameterValue(JBOSSCACCHE_CONFIG) : config.getLockManager()
- .getCacheConfig();
-
- // initialize template
- TemplateConfigurationHelper configurationHelper = TemplateConfigurationHelper.createJBossCacheHelper(cfm);
- InputStream configStream;
- try
- {
- // fill template
- configStream = configurationHelper.fillTemplate(jbcConfig, config.getLockManager().getParameters());
- }
- catch (IOException e)
- {
- throw new RepositoryConfigurationException(e);
- }
-
- CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>();
-
- cache = factory.createCache(configStream, false);
-
this.tm = transactionManager;
- if (transactionManager != null)
- {
- cache.getConfiguration().getRuntimeConfig().setTransactionManager(transactionManager);
- }
+ // create cache using custom factory
+ ExoJBossCacheFactory<Serializable, Object> factory =
+ new ExoJBossCacheFactory<Serializable, Object>(cfm, transactionManager);
+
+ cache = factory.createCache(config.getLockManager());
+
cache.create();
cache.start();
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2010-01-28 14:43:45 UTC (rev 1609)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2010-01-28 15:06:59 UTC (rev 1610)
@@ -29,6 +29,7 @@
import org.exoplatform.services.jcr.impl.core.query.IndexingTree;
import org.exoplatform.services.jcr.impl.core.query.QueryHandler;
import org.exoplatform.services.jcr.impl.core.query.SearchManager;
+import org.exoplatform.services.jcr.jbosscache.ExoJBossCacheFactory;
import org.exoplatform.services.jcr.util.IdGenerator;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -77,25 +78,10 @@
RepositoryConfigurationException
{
super(searchManager, parentSearchManager, config, indexingTree, parentIndexingTree, handler, parentHandler, cfm);
- String jbcConfig = config.getParameterValue(QueryHandlerParams.PARAM_JBOSSCACHE_CONFIGURATION);
+ // create cache using custom factory
+ ExoJBossCacheFactory<Serializable, Object> factory = new ExoJBossCacheFactory<Serializable, Object>(cfm);
+ this.cache = factory.createCache(config);
- // initialize template
- TemplateConfigurationHelper configurationHelper = TemplateConfigurationHelper.createJBossCacheHelper(cfm);
- InputStream configStream;
- try
- {
- // fill template
- configStream = configurationHelper.fillTemplate(jbcConfig, config.getParameters());
- }
- catch (IOException e)
- {
- throw new RepositoryConfigurationException(e);
- }
-
- CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>();
- log.info("JBoss Cache configuration used: " + jbcConfig);
- this.cache = factory.createCache(configStream, false);
-
// initialize IndexerCacheLoader
IndexerCacheLoader indexerCacheLoader = new IndexerCacheLoader();
// inject dependencies
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-01-28 14:43:45 UTC (rev 1609)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-01-28 15:06:59 UTC (rev 1610)
@@ -36,6 +36,7 @@
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData;
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
+import org.exoplatform.services.jcr.jbosscache.ExoJBossCacheFactory;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.transaction.TransactionService;
@@ -257,36 +258,18 @@
* @throws RepositoryException if error of initialization
* @throws RepositoryConfigurationException if error of configuration
*/
- public JBossCacheWorkspaceStorageCache(WorkspaceEntry wsConfig, TransactionService transactionService, ConfigurationManager cfm)
- throws RepositoryException, RepositoryConfigurationException
+ public JBossCacheWorkspaceStorageCache(WorkspaceEntry wsConfig, TransactionService transactionService,
+ ConfigurationManager cfm) throws RepositoryException, RepositoryConfigurationException
{
if (wsConfig.getCache() == null)
{
throw new RepositoryConfigurationException("Cache configuration not found");
}
- String jbcConfig = wsConfig.getCache().getParameterValue(JBOSSCACHE_CONFIG);
-
- CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>();
- LOG.info("JBoss Cache configuration used: " + jbcConfig);
-
- // initialize template
- TemplateConfigurationHelper configurationHelper = TemplateConfigurationHelper.createJBossCacheHelper(cfm);
- InputStream configStream;
- try
- {
- // fill template
- configStream = configurationHelper.fillTemplate(jbcConfig, wsConfig.getCache().getParameters());
- }
- catch (IOException e)
- {
- throw new RepositoryConfigurationException(e);
- }
- this.cache = new BufferedJBossCache(factory.createCache(configStream, false));
- if (transactionService.getTransactionManager() != null)
- {
- cache.getConfiguration().getRuntimeConfig().setTransactionManager(transactionService.getTransactionManager());
- }
+ // create cache using custom factory
+ ExoJBossCacheFactory<Serializable, Object> factory =
+ new ExoJBossCacheFactory<Serializable, Object>(cfm, transactionService.getTransactionManager());
+ this.cache = new BufferedJBossCache(factory.createCache(wsConfig.getCache()));
this.itemsRoot = Fqn.fromElements(ITEMS);
this.childNodes = Fqn.fromElements(CHILD_NODES);
@@ -311,8 +294,8 @@
* @throws RepositoryException if error of initialization
* @throws RepositoryConfigurationException if error of configuration
*/
- public JBossCacheWorkspaceStorageCache(WorkspaceEntry wsConfig, ConfigurationManager cfm) throws RepositoryException,
- RepositoryConfigurationException
+ public JBossCacheWorkspaceStorageCache(WorkspaceEntry wsConfig, ConfigurationManager cfm)
+ throws RepositoryException, RepositoryConfigurationException
{
this(wsConfig, null, cfm);
}
Added: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java (rev 0)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2010-01-28 15:06:59 UTC (rev 1610)
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2010 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.
+ */
+package org.exoplatform.services.jcr.jbosscache;
+
+import org.exoplatform.container.configuration.ConfigurationManager;
+import org.exoplatform.services.jcr.config.MappedParametrizedObjectEntry;
+import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
+import org.exoplatform.services.jcr.config.TemplateConfigurationHelper;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.jboss.cache.Cache;
+import org.jboss.cache.CacheFactory;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jgroups.JChannelFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.transaction.TransactionManager;
+
+/**
+ * Factory that creates pre-configured instances of JBossCache, without starting it.
+ * Path to JBossCache configuration or template should be provided as
+ * "jbosscache-configuration" property in parameterEntry instance. If
+ * transaction manager is configure in ExoJBossCacheFactory, then it
+ * is injected into the cache instance.
+ * <br>
+ * If parameterEntry has "jgroups-multiplexer-stack" (=true) and
+ * "jgroups-configuration" parameters then Multiplexing stack is enabled
+ * in JBossCache (this is highly recommended by RH specialists).
+ *
+ * @author <a href="mailto:nikolazius@gmail.com">Nikolay Zamosenchuk</a>
+ * @version $Id: ExoCacheFactoryImpl.java 34360 2009-07-22 23:58:59Z nzamosenchuk $
+ *
+ */
+public class ExoJBossCacheFactory<K, V>
+{
+
+ public static final String JBOSSCACHE_CONFIG = "jbosscache-configuration";
+
+ public static final String JGROUPS_CONFIG = "jgroups-configuration";
+
+ public static final String JGROUPS_MUX_ENABLED = "jgroups-multiplexer-stack";
+
+ private final TemplateConfigurationHelper configurationHelper;
+
+ private final TransactionManager transactionManager;
+
+ private final Log log = ExoLogger.getLogger(ExoJBossCacheFactory.class);
+
+ /**
+ * Creates ExoJbossCacheFactory with provided configuration transaction managers.
+ * Transaction manager will later be injected to cache instance.
+ *
+ * @param configurationManager
+ * @param transactionManager
+ */
+ public ExoJBossCacheFactory(ConfigurationManager configurationManager, TransactionManager transactionManager)
+ {
+ this.configurationHelper = TemplateConfigurationHelper.createJBossCacheHelper(configurationManager);
+ this.transactionManager = transactionManager;
+ }
+
+ /**
+ * Creates ExoJbossCacheFactory with provided configuration manager and without transaction manager.
+ *
+ * @param configurationManager
+ */
+ public ExoJBossCacheFactory(ConfigurationManager configurationManager)
+ {
+ this.configurationHelper = TemplateConfigurationHelper.createJBossCacheHelper(configurationManager);
+ this.transactionManager = null;
+ }
+
+ /**
+ * Creates pre-configured instance of JBossCache, without starting it.
+ * Path to JBossCache configuration or template should be provided as
+ * "jbosscache-configuration" property in parameterEntry instance. If
+ * transaction manager is configure in ExoJBossCacheFactory, then it
+ * is injected into the cache instance.
+ * <br>
+ * If parameterEntry has "jgroups-multiplexer-stack" (=true) and
+ * "jgroups-configuration" parameters then Multiplexing stack is enabled
+ * in JBossCache (this is highly recommended by RH specialists).
+ *
+ * @param parameterEntry
+ * @return
+ * @throws RepositoryConfigurationException
+ */
+ public Cache<K, V> createCache(MappedParametrizedObjectEntry parameterEntry) throws RepositoryConfigurationException
+ {
+ // get JBossCache configuration file path
+ String jBossCacheConfigurationPath = parameterEntry.getParameterValue(JBOSSCACHE_CONFIG);
+ log.info("JBoss Cache configuration/template used: " + jBossCacheConfigurationPath);
+
+ // prepare configuration
+ InputStream configStream;
+ try
+ {
+ // fill template
+ configStream = configurationHelper.fillTemplate(jBossCacheConfigurationPath, parameterEntry.getParameters());
+ }
+ catch (IOException e)
+ {
+ throw new RepositoryConfigurationException(e);
+ }
+
+ // create cache
+ CacheFactory<K, V> factory = new DefaultCacheFactory<K, V>();
+ Cache<K, V> cache = factory.createCache(configStream, false);
+
+ // inject transaction manager if defined
+ if (transactionManager != null)
+ {
+ cache.getConfiguration().getRuntimeConfig().setTransactionManager(transactionManager);
+ }
+
+ // JGroups multiplexer configuration if enabled
+ if (parameterEntry.getParameterBoolean(JGROUPS_MUX_ENABLED, false))
+ {
+ try
+ {
+ // Get path to JGroups configuration
+ String jgroupsConfigurationFilePath = parameterEntry.getParameterValue(JGROUPS_CONFIG);
+ if (jgroupsConfigurationFilePath != null)
+ {
+ // Create and inject multiplexer fatory
+ JChannelFactory muxFactory = new JChannelFactory();
+ muxFactory.setMultiplexerConfig(jgroupsConfigurationFilePath);
+ cache.getConfiguration().getRuntimeConfig().setMuxChannelFactory(muxFactory);
+ log.info("Multiplexer stack successfully inabled for the cache.");
+ }
+ }
+ catch (Exception e)
+ {
+ // exception occurred setting mux factory
+ e.printStackTrace();
+ throw new RepositoryConfigurationException("Error setting multiplexer configuration.", e);
+ }
+ }
+ return cache;
+ }
+}
Property changes on: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/binding.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/binding.xml 2010-01-28 14:43:45 UTC (rev 1609)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/binding.xml 2010-01-28 15:06:59 UTC (rev 1610)
@@ -71,7 +71,6 @@
factory="org.jibx.runtime.Utility.arrayListFactory" />
<value name="time-out" field="timeout" usage="optional"
deserializer="org.exoplatform.services.jcr.util.ConfigurationFormat.parseTime" />
- <value name="jbosscache-configuration" field="cacheConfig" usage="optional" />
<structure name="persister" field="persister" usage="optional">
<value name="class" field="type" style="attribute" />
14 years, 3 months
exo-jcr SVN: r1609 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config.
by do-not-reply@jboss.org
Author: nzamosenchuk
Date: 2010-01-28 09:43:45 -0500 (Thu, 28 Jan 2010)
New Revision: 1609
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/TemplateConfigurationHelper.java
Log:
EXOJCR-439: Configuration manager is used at first, if fails, then ClassLoader and FileinputStream.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/TemplateConfigurationHelper.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/TemplateConfigurationHelper.java 2010-01-28 14:13:25 UTC (rev 1608)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/TemplateConfigurationHelper.java 2010-01-28 14:43:45 UTC (rev 1609)
@@ -131,10 +131,24 @@
*/
public InputStream fillTemplate(String filename, Map<String, String> parameters) throws IOException
{
+ InputStream inputStream = null;
+ // try to get using configuration manager
+ try
+ {
+ inputStream = cfm.getInputStream(filename);
+ }
+ catch (Exception e)
+ {
+ // will try to use another resolve mechanism
+ }
+
// try to get resource by class loader
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- InputStream inputStream = cl == null ? null : cl.getResourceAsStream(filename);
-
+ if (inputStream == null)
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ inputStream = cl == null ? null : cl.getResourceAsStream(filename);
+ }
+
// check system class loader
if (inputStream == null)
{
@@ -150,22 +164,9 @@
}
catch (IOException e)
{
- // we'll try to get it through configuration manager also
+ // Still can't resolve
}
}
-
- // try to get using configuration manager
- if (inputStream == null)
- {
- try
- {
- inputStream = cfm.getInputStream(filename);
- }
- catch (Exception e)
- {
- // Stream still remains to be null, exception will be thrown below
- }
- }
// inputStream still remains null, so file was not opened
if (inputStream == null)
{
14 years, 3 months
exo-jcr SVN: r1608 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas.
by do-not-reply@jboss.org
Author: sergiykarpenko
Date: 2010-01-28 09:13:25 -0500 (Thu, 28 Jan 2010)
New Revision: 1608
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java
Log:
EXOJCR-448: isRecordAlreadyExistsException updated
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2010-01-28 13:42:00 UTC (rev 1607)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2010-01-28 14:13:25 UTC (rev 1608)
@@ -88,15 +88,15 @@
/**
* MYSQL_PK_CONSTRAINT_DETECT.
*/
- private static final Pattern MYSQL_PK_CONSTRAINT_DETECT = Pattern.compile(MYSQL_PK_CONSTRAINT_DETECT_PATTERN,
- Pattern.CASE_INSENSITIVE);
+ private static final Pattern MYSQL_PK_CONSTRAINT_DETECT =
+ Pattern.compile(MYSQL_PK_CONSTRAINT_DETECT_PATTERN, Pattern.CASE_INSENSITIVE);
/**
* DB2_PK_CONSTRAINT_DETECT_PATTERN.
- * %tableName% must be replaced with original table name before compile Pattern.
+ * %s must be replaced with original table name before compile Pattern.
*/
private static final String DB2_PK_CONSTRAINT_DETECT_PATTERN =
- "(.*DB2 SQL error+.*SQLCODE: -803+.*SQLSTATE: 23505+.*%tableName%.*)+?";
+ "(.*DB2 SQL error+.*SQLCODE: -803+.*SQLSTATE: 23505+.*%s.*)+?";
/**
* DB2_PK_CONSTRAINT_DETECT.
@@ -166,7 +166,7 @@
}
// make error pattern for DB2
- String pattern = DB2_PK_CONSTRAINT_DETECT_PATTERN.replaceAll("%tableName%", tableName);
+ String pattern = String.format(DB2_PK_CONSTRAINT_DETECT_PATTERN, tableName);
DB2_PK_CONSTRAINT_DETECT = Pattern.compile(pattern, Pattern.CASE_INSENSITIVE);
@@ -317,15 +317,9 @@
// most of supported dbs prints PK name in exception
return true;
}
-
- // check DB2 dialect
-
- if (DBConstants.DB_DIALECT_DB2.equalsIgnoreCase(dialect))
+ else if (DBConstants.DB_DIALECT_DB2.equalsIgnoreCase(dialect))
{
- if (DB2_PK_CONSTRAINT_DETECT.matcher(err).find())
- {
- return true;
- }
+ return DB2_PK_CONSTRAINT_DETECT.matcher(err).find();
}
// NOTICE! As an additional check we may ask the database for property currently processed in
14 years, 3 months
exo-jcr SVN: r1607 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas.
by do-not-reply@jboss.org
Author: pnedonosko
Date: 2010-01-28 08:42:00 -0500 (Thu, 28 Jan 2010)
New Revision: 1607
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java
Log:
EXOJCR-310 fix about dialect in VCAS
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2010-01-28 13:37:43 UTC (rev 1606)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2010-01-28 13:42:00 UTC (rev 1607)
@@ -88,8 +88,8 @@
/**
* MYSQL_PK_CONSTRAINT_DETECT.
*/
- private static final Pattern MYSQL_PK_CONSTRAINT_DETECT =
- Pattern.compile(MYSQL_PK_CONSTRAINT_DETECT_PATTERN, Pattern.CASE_INSENSITIVE);
+ private static final Pattern MYSQL_PK_CONSTRAINT_DETECT = Pattern.compile(MYSQL_PK_CONSTRAINT_DETECT_PATTERN,
+ Pattern.CASE_INSENSITIVE);
/**
* DB2_PK_CONSTRAINT_DETECT_PATTERN.
@@ -147,11 +147,12 @@
conn = dataSource.getConnection();
DatabaseMetaData dbMetaData = conn.getMetaData();
- dialect = props.getProperty(JDBC_DIALECT_PARAM);
+ String dialect = props.getProperty(JDBC_DIALECT_PARAM);
if (dialect == null)
{
dialect = DialectDetecter.detect(dbMetaData);
}
+ this.dialect = dialect;
// init database metadata
final String tn = props.getProperty(TABLE_NAME_PARAM);
14 years, 3 months