[infinispan-commits] Infinispan SVN: r946 - in trunk/cachestore/jdbc/src/test: java/org/infinispan/loaders/jdbc and 5 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed Oct 14 13:12:26 EDT 2009
Author: mircea.markus
Date: 2009-10-14 13:12:25 -0400 (Wed, 14 Oct 2009)
New Revision: 946
Added:
trunk/cachestore/jdbc/src/test/resources/configs/jdbc-parsing-test.xml
trunk/cachestore/jdbc/src/test/resources/configs/managed/
trunk/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml
trunk/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml
trunk/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml
Removed:
trunk/cachestore/jdbc/src/test/resources/configs/binary-managed-connection-factory.xml
trunk/cachestore/jdbc/src/test/resources/configs/mixed-managed-connection-factory.xml
trunk/cachestore/jdbc/src/test/resources/configs/str-managed-connection-factory.xml
Modified:
trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/ManagedConnectionFactoryTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/BinaryStoreWithManagedConnectionTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/MixedStoreWithManagedConnectionTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/StringStoreWithManagedConnectionTest.java
Log:
[ISPN-105] - (managed connection pool) - fixed tests
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java 2009-10-14 16:47:43 UTC (rev 945)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/config/parsing/JdbcConfigurationParserTest.java 2009-10-14 17:12:25 UTC (rev 946)
@@ -1,7 +1,5 @@
package org.infinispan.config.parsing;
-import java.util.Map;
-
import org.infinispan.config.CacheLoaderManagerConfig;
import org.infinispan.config.Configuration;
import org.infinispan.config.InfinispanConfiguration;
@@ -14,12 +12,14 @@
import org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStoreConfig;
import org.testng.annotations.Test;
+import java.util.Map;
+
@Test(groups = "unit", testName = "config.parsing.JdbcConfigurationParserTest")
public class JdbcConfigurationParserTest {
public void testCacheLoaders() throws Exception {
- InfinispanConfiguration configuration = InfinispanConfiguration.newInfinispanConfiguration("configs/named-cache-test.xml");
+ InfinispanConfiguration configuration = InfinispanConfiguration.newInfinispanConfiguration("configs/jdbc-parsing-test.xml");
Map<String, Configuration> namedConfigurations = configuration.parseNamedConfigurations();
Configuration c = namedConfigurations.get("withJDBCLoader");
CacheLoaderManagerConfig clc = c.getCacheLoaderManagerConfig();
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/ManagedConnectionFactoryTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/ManagedConnectionFactoryTest.java 2009-10-14 16:47:43 UTC (rev 945)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/ManagedConnectionFactoryTest.java 2009-10-14 17:12:25 UTC (rev 946)
@@ -24,24 +24,25 @@
@Test(groups = "functional", testName = "loaders.jdbc.ManagedConnectionFactoryTest")
public abstract class ManagedConnectionFactoryTest extends BaseCacheStoreTest {
- public static final String DATASOURCE_LOCATION = "java:/ManagedConnectionFactoryTest/DS";
private DummyDataSource ds;
- @BeforeClass
+ @BeforeClass (alwaysRun = true)
public void bindDatasourceInJndi() throws Exception {
System.setProperty(Context.INITIAL_CONTEXT_FACTORY, DummyContextFactory.class.getName());
ds = new DummyDataSource();
ds.start();
InitialContext ic = new InitialContext();
- ic.bind(DATASOURCE_LOCATION, ds);
- assert ic.lookup(DATASOURCE_LOCATION) instanceof DummyDataSource;
+ ic.bind(getDatasourceLocation(), ds);
+ assert ic.lookup(getDatasourceLocation()) instanceof DummyDataSource;
}
- @AfterClass
+ public abstract String getDatasourceLocation();
+
+ @AfterClass (alwaysRun = true)
public void destroyDatasourceAndUnbind() throws NamingException {
InitialContext ic = new InitialContext();
- ic.unbind(DATASOURCE_LOCATION);
- assert ic.lookup(DATASOURCE_LOCATION) == null;
+ ic.unbind(getDatasourceLocation());
+ assert ic.lookup(getDatasourceLocation()) == null;
ds.stop();
}
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/BinaryStoreWithManagedConnectionTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/BinaryStoreWithManagedConnectionTest.java 2009-10-14 16:47:43 UTC (rev 945)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/BinaryStoreWithManagedConnectionTest.java 2009-10-14 17:12:25 UTC (rev 946)
@@ -23,7 +23,7 @@
protected CacheStore createCacheStore() throws Exception {
ConnectionFactoryConfig connectionFactoryConfig = new ConnectionFactoryConfig();
connectionFactoryConfig.setConnectionFactoryClass(ManagedConnectionFactory.class.getName());
- connectionFactoryConfig.setDatasourceJndiLocation(DATASOURCE_LOCATION);
+ connectionFactoryConfig.setDatasourceJndiLocation(getDatasourceLocation());
TableManipulation tm = UnitTestDatabaseManager.buildDefaultTableManipulation();
JdbcBinaryCacheStoreConfig config = new JdbcBinaryCacheStoreConfig(connectionFactoryConfig, tm);
JdbcBinaryCacheStore jdbcBinaryCacheStore = new JdbcBinaryCacheStore();
@@ -37,7 +37,7 @@
public void testLoadFromFile() throws Exception {
CacheManager cm = null;
try {
- cm = new DefaultCacheManager("configs/binary-managed-connection-factory.xml");
+ cm = new DefaultCacheManager("configs/managed/binary-managed-connection-factory.xml");
Cache<String, String> first = cm.getCache("first");
Cache<String, String> second = cm.getCache("second");
@@ -51,8 +51,16 @@
JdbcBinaryCacheStore loader = (JdbcBinaryCacheStore) cacheLoaderManager.getCacheLoader();
assert loader.getConnectionFactory() instanceof ManagedConnectionFactory;
} finally {
- TestingUtil.killCacheManagers(cm);
+ try {
+ TestingUtil.killCacheManagers(cm);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
}
}
+ @Override
+ public String getDatasourceLocation() {
+ return "java:/BinaryStoreWithManagedConnectionTest/DS";
+ }
}
\ No newline at end of file
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/MixedStoreWithManagedConnectionTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/MixedStoreWithManagedConnectionTest.java 2009-10-14 16:47:43 UTC (rev 945)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/MixedStoreWithManagedConnectionTest.java 2009-10-14 17:12:25 UTC (rev 946)
@@ -24,7 +24,7 @@
protected CacheStore createCacheStore() throws Exception {
ConnectionFactoryConfig connectionFactoryConfig = new ConnectionFactoryConfig();
connectionFactoryConfig.setConnectionFactoryClass(ManagedConnectionFactory.class.getName());
- connectionFactoryConfig.setDatasourceJndiLocation(DATASOURCE_LOCATION);
+ connectionFactoryConfig.setDatasourceJndiLocation(getDatasourceLocation());
TableManipulation stringsTm = UnitTestDatabaseManager.buildDefaultTableManipulation();
stringsTm.setTableNamePrefix("STRINGS_TABLE");
TableManipulation binaryTm = UnitTestDatabaseManager.buildDefaultTableManipulation();
@@ -41,7 +41,7 @@
public void testLoadFromFile() throws Exception {
CacheManager cm = null;
try {
- cm = new DefaultCacheManager("configs/mixed-managed-connection-factory.xml");
+ cm = new DefaultCacheManager("configs/managed/mixed-managed-connection-factory.xml");
Cache<String, String> first = cm.getCache("first");
Cache<String, String> second = cm.getCache("second");
@@ -58,4 +58,9 @@
TestingUtil.killCacheManagers(cm);
}
}
+
+ @Override
+ public String getDatasourceLocation() {
+ return "java:/MixedStoreWithManagedConnectionTest/DS";
+ }
}
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/StringStoreWithManagedConnectionTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/StringStoreWithManagedConnectionTest.java 2009-10-14 16:47:43 UTC (rev 945)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/StringStoreWithManagedConnectionTest.java 2009-10-14 17:12:25 UTC (rev 946)
@@ -24,7 +24,7 @@
protected CacheStore createCacheStore() throws Exception {
ConnectionFactoryConfig connectionFactoryConfig = new ConnectionFactoryConfig();
connectionFactoryConfig.setConnectionFactoryClass(ManagedConnectionFactory.class.getName());
- connectionFactoryConfig.setDatasourceJndiLocation(DATASOURCE_LOCATION);
+ connectionFactoryConfig.setDatasourceJndiLocation(getDatasourceLocation());
TableManipulation tm = UnitTestDatabaseManager.buildDefaultTableManipulation();
JdbcStringBasedCacheStoreConfig config = new JdbcStringBasedCacheStoreConfig(connectionFactoryConfig, tm);
JdbcStringBasedCacheStore stringBasedCacheStore = new JdbcStringBasedCacheStore();
@@ -36,7 +36,7 @@
public void testLoadFromFile() throws Exception {
CacheManager cm = null;
try {
- cm = new DefaultCacheManager("configs/str-managed-connection-factory.xml");
+ cm = new DefaultCacheManager("configs/managed/str-managed-connection-factory.xml");
Cache<String, String> first = cm.getCache("first");
Cache<String, String> second = cm.getCache("second");
@@ -53,4 +53,9 @@
TestingUtil.killCacheManagers(cm);
}
}
+
+ @Override
+ public String getDatasourceLocation() {
+ return "java:/StringStoreWithManagedConnectionTest/DS";
+ }
}
Deleted: trunk/cachestore/jdbc/src/test/resources/configs/binary-managed-connection-factory.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/binary-managed-connection-factory.xml 2009-10-14 16:47:43 UTC (rev 945)
+++ trunk/cachestore/jdbc/src/test/resources/configs/binary-managed-connection-factory.xml 2009-10-14 17:12:25 UTC (rev 946)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
- <global>
-
- <!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
- <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
- <properties>
- <property name="maxThreads" value="5"/>
- <property name="threadNamePrefix" value="AsyncListenerThread"/>
- </properties>
- </asyncListenerExecutor>
-
- <asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
- <properties>
- <property name="maxThreads" value="25"/>
- <property name="threadNamePrefix" value="AsyncSerializationThread"/>
- </properties>
- </asyncTransportExecutor>
-
- <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
- <properties>
- <property name="threadNamePrefix" value="EvictionThread"/>
- </properties>
- </evictionScheduledExecutor>
-
- <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
- <properties>
- <property name="threadNamePrefix" value="ReplicationQueueThread"/>
- </properties>
- </replicationQueueScheduledExecutor>
-
- <globalJmxStatistics enabled="false" jmxDomain="infinispan"/>
-
- <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
-
- <shutdown hookBehavior="DEFAULT"/>
- </global>
-
- <default>
- <locking
- isolationLevel="REPEATABLE_READ"
- lockAcquisitionTimeout="20000"
- writeSkewCheck="false"
- concurrencyLevel="500" useLockStriping="false"/>
- <loaders>
- <loader class="org.infinispan.loaders.jdbc.binary.JdbcBinaryCacheStore" fetchPersistentState="false"
- ignoreModifications="false" purgeOnStartup="false">
- <properties>
- <property name="bucketTableNamePrefix" value="ISPN_BUCKET_TABLE"/>
- <property name="idColumnName" value="ID_COLUMN"/>
- <property name="dataColumnName" value="DATA_COLUMN"/>
- <property name="timestampColumnName" value="TIMESTAMP_COLUMN"/>
- <property name="timestampColumnType" value="BIGINT"/>
- <property name="connectionFactoryClass"
- value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory"/>
- <property name="datasourceJndiLocation" value="java:/ManagedConnectionFactoryTest/DS"/>
-
- <property name="userName" value="sa"/>
- <property name="driverClass" value="org.h2.Driver"/>
- <property name="idColumnType" value="VARCHAR(255)"/>
- <property name="dataColumnType" value="BINARY"/>
- <property name="dropTableOnExit" value="true"/>
- <property name="createTableOnStart" value="true"/>
- </properties>
- </loader>
- </loaders>
-
- </default>
-
-
- <namedCache name="first"/>
-
- <namedCache name="second"/>
-
-</infinispan>
Added: trunk/cachestore/jdbc/src/test/resources/configs/jdbc-parsing-test.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/jdbc-parsing-test.xml (rev 0)
+++ trunk/cachestore/jdbc/src/test/resources/configs/jdbc-parsing-test.xml 2009-10-14 17:12:25 UTC (rev 946)
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+ <properties>
+ <property name="maxThreads" value="5"/>
+ <property name="threadNamePrefix" value="AsyncListenerThread"/>
+ </properties>
+ </asyncListenerExecutor>
+
+ <asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+ <properties>
+ <property name="maxThreads" value="25"/>
+ <property name="threadNamePrefix" value="AsyncSerializationThread"/>
+ </properties>
+ </asyncTransportExecutor>
+
+ <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+ <properties>
+ <property name="threadNamePrefix" value="EvictionThread"/>
+ </properties>
+ </evictionScheduledExecutor>
+
+ <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+ <properties>
+ <property name="threadNamePrefix" value="ReplicationQueueThread"/>
+ </properties>
+ </replicationQueueScheduledExecutor>
+
+ <transport clusterName="infinispan-cluster" distributedSyncTimeout="50000" nodeName="Jalapeno">
+ <!-- Note that the JGroups transport uses sensible defaults if no configuration property is defined. -->
+ <properties>
+ <property name="configurationFile" value="udp.xml"/>
+ </properties>
+ <!-- See the JGroupsTransport javadocs for more flags -->
+ </transport>
+
+ <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
+ <globalJmxStatistics enabled="false" jmxDomain="funky_domain"
+ mBeanServerLookup="org.infinispan.jmx.PerThreadMBeanServerLookup"
+ allowDuplicateDomains="true"/>
+
+ <shutdown hookBehavior="REGISTER"/>
+ </global>
+
+ <default>
+ <locking concurrencyLevel="100" lockAcquisitionTimeout="1000"/>
+ <jmxStatistics enabled="false"/>
+ </default>
+
+ <namedCache name="transactional">
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" useEagerLocking="true"/>
+ </namedCache>
+
+ <namedCache name="syncRepl">
+ <clustering mode="repl">
+ <stateRetrieval fetchInMemoryState="false"/>
+ <sync replTimeout="15000"/>
+ </clustering>
+ </namedCache>
+
+ <namedCache name="asyncRepl">
+ <clustering mode="repl">
+ <stateRetrieval fetchInMemoryState="false"/>
+ <async asyncMarshalling="false"/>
+ </clustering>
+ </namedCache>
+
+ <namedCache name="asyncReplQueue">
+ <clustering mode="repl">
+ <stateRetrieval fetchInMemoryState="false"/>
+ <async useReplQueue="true" replQueueInterval="1234" replQueueMaxElements="100"/>
+ </clustering>
+ </namedCache>
+
+ <namedCache name="txSyncRepl">
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"/>
+ <clustering mode="repl">
+ <stateRetrieval fetchInMemoryState="false"/>
+ <sync replTimeout="15000"/>
+ </clustering>
+ </namedCache>
+
+ <namedCache name="overriding">
+ <locking isolationLevel="REPEATABLE_READ" concurrencyLevel="1000" lockAcquisitionTimeout="20000"/>
+ </namedCache>
+
+ <namedCache name="lazyDeserialization">
+ <locking isolationLevel="REPEATABLE_READ" concurrencyLevel="1000" lockAcquisitionTimeout="20000"/>
+ <lazyDeserialization enabled="true"/>
+ </namedCache>
+
+ <namedCache name="withLoader">
+ <loaders passivation="false" shared="false" preload="true">
+
+ <!--
+ We can have multiple cache loaders, which get chained
+ -->
+ <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="true"
+ ignoreModifications="true" purgeOnStartup="true">
+
+ <!-- See the documentation for more configuration examples and flags. -->
+ <properties>
+ <property name="location" value="/tmp/FileCacheStore-Location"/>
+ </properties>
+ <singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/>
+ <async enabled="true" mapLockTimeout="15000" threadPoolSize="5"/>
+ </loader>
+ </loaders>
+ </namedCache>
+
+ <namedCache name="dist">
+ <clustering mode="distribution">
+ <sync/>
+ <hash numOwners="3" rehashWait="120000"/>
+ <l1 enabled="true" lifespan="600000"/>
+ </clustering>
+ </namedCache>
+
+ <!-- Note that any of the elements appearing in a namedCache section can also appear in the default section as a template. -->
+ <namedCache name="evictionCache">
+
+ <!--
+ Eviction configuration. WakeupInterval defines how often the eviction thread runs, in milliseconds. 0 means
+ the eviction thread will never run. A separate executor is used for eviction in each cache.
+ -->
+ <eviction wakeUpInterval="500" maxEntries="5000" strategy="FIFO"/>
+ <expiration lifespan="60000" maxIdle="1000"/>
+ </namedCache>
+
+ <namedCache name="withouthJmxEnabled">
+ <clustering>
+ <async useReplQueue="true" replQueueInterval="100" replQueueMaxElements="200"/>
+ </clustering>
+ <jmxStatistics enabled="false"/>
+ </namedCache>
+
+ <namedCache name="withDeadlockDetection">
+ <clustering>
+ <sync replTimeout="20000"/>
+ </clustering>
+ <jmxStatistics enabled="false"/>
+ <deadlockDetection enabled="true" spinDuration="1221"/>
+ </namedCache>
+
+ <namedCache name="withJDBCLoader">
+ <clustering>
+ <sync replTimeout="20000"/>
+ </clustering>
+ <jmxStatistics enabled="false"/>
+ <deadlockDetection enabled="true" spinDuration="1221"/>
+ <loaders passivation="true" shared="true" preload="true">
+ <loader class="org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="true"
+ ignoreModifications="true" purgeOnStartup="true">
+ <properties>
+ <property name="connectionFactoryClass" value="org.infinispan.loaders.jdbc.connectionfactory.PooledConnectionFactory"/>
+ <property name="connectionUrl" value="jdbc://some-url"/>
+ <property name="userName" value="root"/>
+ <property name="driverClass" value="org.dbms.Driver"/>
+ <property name="idColumnType" value="VARCHAR2(256)"/>
+ <property name="dataColumnType" value="BLOB"/>
+ <property name="dropTableOnExit" value="true"/>
+ <property name="createTableOnStart" value="false"/>
+ </properties>
+ <singletonStore enabled="true" pushStateWhenCoordinator="true" pushStateTimeout="20000"/>
+ <async enabled="true" threadPoolSize="10" mapLockTimeout="10000"/>
+ </loader>
+ </loaders>
+ </namedCache>
+
+
+ <namedCache name="cacheWithCustomInterceptors">
+
+ <!--
+ Define custom interceptors. All custom interceptors need to extend org.jboss.cache.interceptors.base.CommandInterceptor
+ Here we use existing class so we can actually load it
+ -->
+ <customInterceptors>
+ <interceptor position="FIRST" class="org.infinispan.interceptors.CallInterceptor"></interceptor>
+ <interceptor position="LAST" class="org.infinispan.interceptors.CallInterceptor"/>
+ <interceptor index="3" class="org.infinispan.interceptors.CallInterceptor"/>
+ <interceptor before="org.infinispan.interceptors.CallInterceptor" class="org.infinispan.interceptors.CallInterceptor"/>
+ <interceptor after="org.infinispan.interceptors.CallInterceptor" class="org.infinispan.interceptors.CallInterceptor"/>
+ </customInterceptors>
+ </namedCache>
+
+</infinispan>
Copied: trunk/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml (from rev 945, trunk/cachestore/jdbc/src/test/resources/configs/binary-managed-connection-factory.xml)
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml (rev 0)
+++ trunk/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml 2009-10-14 17:12:25 UTC (rev 946)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
+ <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+ <properties>
+ <property name="maxThreads" value="5"/>
+ <property name="threadNamePrefix" value="AsyncListenerThread"/>
+ </properties>
+ </asyncListenerExecutor>
+
+ <asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+ <properties>
+ <property name="maxThreads" value="25"/>
+ <property name="threadNamePrefix" value="AsyncSerializationThread"/>
+ </properties>
+ </asyncTransportExecutor>
+
+ <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+ <properties>
+ <property name="threadNamePrefix" value="EvictionThread"/>
+ </properties>
+ </evictionScheduledExecutor>
+
+ <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+ <properties>
+ <property name="threadNamePrefix" value="ReplicationQueueThread"/>
+ </properties>
+ </replicationQueueScheduledExecutor>
+
+ <globalJmxStatistics enabled="false" jmxDomain="infinispan"/>
+
+ <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
+
+ <shutdown hookBehavior="DEFAULT"/>
+ </global>
+
+ <default>
+ <locking
+ isolationLevel="REPEATABLE_READ"
+ lockAcquisitionTimeout="20000"
+ writeSkewCheck="false"
+ concurrencyLevel="500" useLockStriping="false"/>
+ <loaders>
+ <loader class="org.infinispan.loaders.jdbc.binary.JdbcBinaryCacheStore" fetchPersistentState="false"
+ ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ <property name="bucketTableNamePrefix" value="ISPN_BUCKET_TABLE"/>
+ <property name="idColumnName" value="ID_COLUMN"/>
+ <property name="dataColumnName" value="DATA_COLUMN"/>
+ <property name="timestampColumnName" value="TIMESTAMP_COLUMN"/>
+ <property name="timestampColumnType" value="BIGINT"/>
+ <property name="connectionFactoryClass"
+ value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory"/>
+ <property name="datasourceJndiLocation" value="java:/BinaryStoreWithManagedConnectionTest/DS"/>
+
+ <property name="userName" value="sa"/>
+ <property name="driverClass" value="org.h2.Driver"/>
+ <property name="idColumnType" value="VARCHAR(255)"/>
+ <property name="dataColumnType" value="BINARY"/>
+ <property name="dropTableOnExit" value="true"/>
+ <property name="createTableOnStart" value="true"/>
+ </properties>
+ </loader>
+ </loaders>
+
+ </default>
+
+
+ <namedCache name="first"/>
+
+ <namedCache name="second"/>
+
+</infinispan>
Copied: trunk/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml (from rev 945, trunk/cachestore/jdbc/src/test/resources/configs/mixed-managed-connection-factory.xml)
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml (rev 0)
+++ trunk/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml 2009-10-14 17:12:25 UTC (rev 946)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
+ <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+ <properties>
+ <property name="maxThreads" value="5"/>
+ <property name="threadNamePrefix" value="AsyncListenerThread"/>
+ </properties>
+ </asyncListenerExecutor>
+
+ <asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+ <properties>
+ <property name="maxThreads" value="25"/>
+ <property name="threadNamePrefix" value="AsyncSerializationThread"/>
+ </properties>
+ </asyncTransportExecutor>
+
+ <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+ <properties>
+ <property name="threadNamePrefix" value="EvictionThread"/>
+ </properties>
+ </evictionScheduledExecutor>
+
+ <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+ <properties>
+ <property name="threadNamePrefix" value="ReplicationQueueThread"/>
+ </properties>
+ </replicationQueueScheduledExecutor>
+
+ <globalJmxStatistics enabled="false" jmxDomain="infinispan"/>
+
+ <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
+
+ <shutdown hookBehavior="DEFAULT"/>
+ </global>
+
+ <default>
+ <locking
+ isolationLevel="REPEATABLE_READ"
+ lockAcquisitionTimeout="20000"
+ writeSkewCheck="false"
+ concurrencyLevel="500" useLockStriping="false"/>
+ <loaders>
+ <loader class="org.infinispan.loaders.jdbc.mixed.JdbcMixedCacheStore" fetchPersistentState="false"
+ ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ <property name="tableNamePrefixForStrings" value="ISPN_MIXED_STR_TABLE"/>
+ <property name="tableNamePrefixForBinary" value="ISPN_MIXED_BINARY_TABLE"/>
+ <property name="idColumnNameForStrings" value="ID_COLUMN"/>
+ <property name="idColumnNameForBinary" value="ID_COLUMN"/>
+ <property name="dataColumnNameForStrings" value="DATA_COLUMN"/>
+ <property name="dataColumnNameForBinary" value="DATA_COLUMN"/>
+ <property name="timestampColumnNameForStrings" value="TIMESTAMP_COLUMN"/>
+ <property name="timestampColumnNameForBinary" value="TIMESTAMP_COLUMN"/>
+ <property name="timestampColumnTypeForStrings" value="BIGINT"/>
+ <property name="timestampColumnTypeForBinary" value="BIGINT"/>
+ <property name="connectionFactoryClass"
+ value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory"/>
+ <property name="datasourceJndiLocation" value="java:/MixedStoreWithManagedConnectionTest/DS"/>
+ <property name="userName" value="sa"/>
+ <property name="driverClass" value="org.h2.Driver"/>
+ <property name="idColumnTypeForStrings" value="VARCHAR(255)"/>
+ <property name="idColumnTypeForBinary" value="VARCHAR(255)"/>
+ <property name="dataColumnTypeForStrings" value="BINARY"/>
+ <property name="dataColumnTypeForBinary" value="BINARY"/>
+ <property name="dropTableOnExitForStrings" value="false"/>
+ <property name="dropTableOnExitForBinary" value="false"/>
+ <property name="createTableOnStartForStrings" value="true"/>
+ <property name="createTableOnStartForBinary" value="true"/>
+ <property name="createTableOnStartForStrings" value="true"/>
+ <property name="createTableOnStartForBinary" value="true"/>
+ </properties>
+
+ </loader>
+ </loaders>
+
+ </default>
+
+
+ <namedCache name="first"/>
+
+ <namedCache name="second"/>
+
+</infinispan>
Copied: trunk/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml (from rev 945, trunk/cachestore/jdbc/src/test/resources/configs/str-managed-connection-factory.xml)
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml (rev 0)
+++ trunk/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml 2009-10-14 17:12:25 UTC (rev 946)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+
+ <global>
+
+ <!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
+ <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+ <properties>
+ <property name="maxThreads" value="5"/>
+ <property name="threadNamePrefix" value="AsyncListenerThread"/>
+ </properties>
+ </asyncListenerExecutor>
+
+ <asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+ <properties>
+ <property name="maxThreads" value="25"/>
+ <property name="threadNamePrefix" value="AsyncSerializationThread"/>
+ </properties>
+ </asyncTransportExecutor>
+
+ <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+ <properties>
+ <property name="threadNamePrefix" value="EvictionThread"/>
+ </properties>
+ </evictionScheduledExecutor>
+
+ <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+ <properties>
+ <property name="threadNamePrefix" value="ReplicationQueueThread"/>
+ </properties>
+ </replicationQueueScheduledExecutor>
+
+ <globalJmxStatistics enabled="false" jmxDomain="infinispan"/>
+
+ <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
+
+ <shutdown hookBehavior="DEFAULT"/>
+ </global>
+
+ <default>
+ <locking
+ isolationLevel="REPEATABLE_READ"
+ lockAcquisitionTimeout="20000"
+ writeSkewCheck="false"
+ concurrencyLevel="500" useLockStriping="false"/>
+ <loaders>
+ <loader class="org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="false"
+ ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ <property name="stringsTableNamePrefix" value="ISPN_STRING_TABLE"/>
+ <property name="idColumnName" value="ID_COLUMN"/>
+ <property name="dataColumnName" value="DATA_COLUMN"/>
+ <property name="timestampColumnName" value="TIMESTAMP_COLUMN"/>
+ <property name="timestampColumnType" value="BIGINT"/>
+ <property name="connectionFactoryClass"
+ value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory"/>
+ <property name="datasourceJndiLocation" value="java:/StringStoreWithManagedConnectionTest/DS"/>
+ <property name="idColumnType" value="VARCHAR(255)"/>
+ <property name="dataColumnType" value="BINARY"/>
+ <property name="dropTableOnExit" value="true"/>
+ <property name="createTableOnStart" value="true"/>
+ </properties>
+ </loader>
+ </loaders>
+
+ </default>
+
+
+ <namedCache name="first"/>
+
+ <namedCache name="second"/>
+
+</infinispan>
Deleted: trunk/cachestore/jdbc/src/test/resources/configs/mixed-managed-connection-factory.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/mixed-managed-connection-factory.xml 2009-10-14 16:47:43 UTC (rev 945)
+++ trunk/cachestore/jdbc/src/test/resources/configs/mixed-managed-connection-factory.xml 2009-10-14 17:12:25 UTC (rev 946)
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
- <global>
-
- <!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
- <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
- <properties>
- <property name="maxThreads" value="5"/>
- <property name="threadNamePrefix" value="AsyncListenerThread"/>
- </properties>
- </asyncListenerExecutor>
-
- <asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
- <properties>
- <property name="maxThreads" value="25"/>
- <property name="threadNamePrefix" value="AsyncSerializationThread"/>
- </properties>
- </asyncTransportExecutor>
-
- <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
- <properties>
- <property name="threadNamePrefix" value="EvictionThread"/>
- </properties>
- </evictionScheduledExecutor>
-
- <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
- <properties>
- <property name="threadNamePrefix" value="ReplicationQueueThread"/>
- </properties>
- </replicationQueueScheduledExecutor>
-
- <globalJmxStatistics enabled="false" jmxDomain="infinispan"/>
-
- <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
-
- <shutdown hookBehavior="DEFAULT"/>
- </global>
-
- <default>
- <locking
- isolationLevel="REPEATABLE_READ"
- lockAcquisitionTimeout="20000"
- writeSkewCheck="false"
- concurrencyLevel="500" useLockStriping="false"/>
- <loaders>
- <loader class="org.infinispan.loaders.jdbc.mixed.JdbcMixedCacheStore" fetchPersistentState="false"
- ignoreModifications="false" purgeOnStartup="false">
- <properties>
- <property name="tableNamePrefixForStrings" value="ISPN_MIXED_STR_TABLE"/>
- <property name="tableNamePrefixForBinary" value="ISPN_MIXED_BINARY_TABLE"/>
- <property name="idColumnNameForStrings" value="ID_COLUMN"/>
- <property name="idColumnNameForBinary" value="ID_COLUMN"/>
- <property name="dataColumnNameForStrings" value="DATA_COLUMN"/>
- <property name="dataColumnNameForBinary" value="DATA_COLUMN"/>
- <property name="timestampColumnNameForStrings" value="TIMESTAMP_COLUMN"/>
- <property name="timestampColumnNameForBinary" value="TIMESTAMP_COLUMN"/>
- <property name="timestampColumnTypeForStrings" value="BIGINT"/>
- <property name="timestampColumnTypeForBinary" value="BIGINT"/>
- <property name="connectionFactoryClass"
- value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory"/>
- <property name="datasourceJndiLocation" value="java:/ManagedConnectionFactoryTest/DS"/>
- <property name="userName" value="sa"/>
- <property name="driverClass" value="org.h2.Driver"/>
- <property name="idColumnTypeForStrings" value="VARCHAR(255)"/>
- <property name="idColumnTypeForBinary" value="VARCHAR(255)"/>
- <property name="dataColumnTypeForStrings" value="BINARY"/>
- <property name="dataColumnTypeForBinary" value="BINARY"/>
- <property name="dropTableOnExitForStrings" value="false"/>
- <property name="dropTableOnExitForBinary" value="false"/>
- <property name="createTableOnStartForStrings" value="true"/>
- <property name="createTableOnStartForBinary" value="true"/>
- <property name="createTableOnStartForStrings" value="true"/>
- <property name="createTableOnStartForBinary" value="true"/>
- </properties>
-
- </loader>
- </loaders>
-
- </default>
-
-
- <namedCache name="first"/>
-
- <namedCache name="second"/>
-
-</infinispan>
Deleted: trunk/cachestore/jdbc/src/test/resources/configs/str-managed-connection-factory.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/str-managed-connection-factory.xml 2009-10-14 16:47:43 UTC (rev 945)
+++ trunk/cachestore/jdbc/src/test/resources/configs/str-managed-connection-factory.xml 2009-10-14 17:12:25 UTC (rev 946)
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
- <global>
-
- <!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
- <asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
- <properties>
- <property name="maxThreads" value="5"/>
- <property name="threadNamePrefix" value="AsyncListenerThread"/>
- </properties>
- </asyncListenerExecutor>
-
- <asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
- <properties>
- <property name="maxThreads" value="25"/>
- <property name="threadNamePrefix" value="AsyncSerializationThread"/>
- </properties>
- </asyncTransportExecutor>
-
- <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
- <properties>
- <property name="threadNamePrefix" value="EvictionThread"/>
- </properties>
- </evictionScheduledExecutor>
-
- <replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
- <properties>
- <property name="threadNamePrefix" value="ReplicationQueueThread"/>
- </properties>
- </replicationQueueScheduledExecutor>
-
- <globalJmxStatistics enabled="false" jmxDomain="infinispan"/>
-
- <serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0"/>
-
- <shutdown hookBehavior="DEFAULT"/>
- </global>
-
- <default>
- <locking
- isolationLevel="REPEATABLE_READ"
- lockAcquisitionTimeout="20000"
- writeSkewCheck="false"
- concurrencyLevel="500" useLockStriping="false"/>
- <loaders>
- <loader class="org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="false"
- ignoreModifications="false" purgeOnStartup="false">
- <properties>
- <property name="stringsTableNamePrefix" value="ISPN_STRING_TABLE"/>
- <property name="idColumnName" value="ID_COLUMN"/>
- <property name="dataColumnName" value="DATA_COLUMN"/>
- <property name="timestampColumnName" value="TIMESTAMP_COLUMN"/>
- <property name="timestampColumnType" value="BIGINT"/>
- <property name="connectionFactoryClass"
- value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory"/>
- <property name="datasourceJndiLocation" value="java:/ManagedConnectionFactoryTest/DS"/>
- <property name="idColumnType" value="VARCHAR(255)"/>
- <property name="dataColumnType" value="BINARY"/>
- <property name="dropTableOnExit" value="true"/>
- <property name="createTableOnStart" value="true"/>
- </properties>
- </loader>
- </loaders>
-
- </default>
-
-
- <namedCache name="first"/>
-
- <namedCache name="second"/>
-
-</infinispan>
More information about the infinispan-commits
mailing list