[infinispan-commits] Infinispan SVN: r662 - in trunk: cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc and 7 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Aug 13 06:45:17 EDT 2009
Author: mircea.markus
Date: 2009-08-13 06:45:16 -0400 (Thu, 13 Aug 2009)
New Revision: 662
Added:
trunk/cachestore/jdbc/src/test/resources/c3p0.properties
trunk/cachestore/jdbc/src/test/resources/configs/
trunk/cachestore/jdbc/src/test/resources/configs/binary.xml
trunk/cachestore/jdbc/src/test/resources/configs/mixed.xml
trunk/cachestore/jdbc/src/test/resources/configs/string-based.xml
Removed:
trunk/cachestore/jdbc/src/test/resources/binary.xml
trunk/cachestore/jdbc/src/test/resources/mixed.xml
trunk/cachestore/jdbc/src/test/resources/string-based.xml
Modified:
trunk/cachestore/jdbc/pom.xml
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactoryConfig.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java
trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java
Log:
fixed interrmitent failures by switching to h2 database (hsqldb was randomly failing) interrmitent
Modified: trunk/cachestore/jdbc/pom.xml
===================================================================
--- trunk/cachestore/jdbc/pom.xml 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/pom.xml 2009-08-13 10:45:16 UTC (rev 662)
@@ -14,6 +14,11 @@
<artifactId>infinispan-cachestore-jdbc</artifactId>
<name>Infinispan JDBC CacheStore</name>
<description>Infinispan JDBC CacheStore module</description>
+
+ <properties>
+ <version.log4j>1.2.14</version.log4j>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project-package}</groupId>
@@ -36,12 +41,19 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${version.log4j}</version>
<scope>test</scope>
- <version>1.8.0.7</version>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.1.117</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- used to serialize non-serializable objects for a dummy marshaller -->
<dependency>
<groupId>xstream</groupId>
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java 2009-08-13 10:45:16 UTC (rev 662)
@@ -111,7 +111,7 @@
catch (SQLException e) {
// This should not happen. A J2EE compatible JDBC driver is
// required fully support meta data.
- throw new IllegalStateException("Error while checking if table aleady exists " + tableName, e);
+ throw new CacheLoaderException("Error while checking if table aleady exists " + tableName, e);
}
finally {
JdbcUtil.safeClose(rs);
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStore.java 2009-08-13 10:45:16 UTC (rev 662)
@@ -81,8 +81,7 @@
@Override
public void toStreamProcess(ResultSet rs, InputStream is, ObjectOutput objectOutput) throws CacheLoaderException, SQLException, IOException {
- InputStream inputStream = rs.getBinaryStream(1);
- Bucket bucket = (Bucket) JdbcUtil.unmarshall(getMarshaller(), inputStream);
+ Bucket bucket = (Bucket) JdbcUtil.unmarshall(getMarshaller(), is);
String bucketName = rs.getString(2);
marshaller.objectToObjectStream(bucketName, objectOutput);
marshaller.objectToObjectStream(bucket, objectOutput);
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactoryConfig.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactoryConfig.java 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ConnectionFactoryConfig.java 2009-08-13 10:45:16 UTC (rev 662)
@@ -73,4 +73,14 @@
throw new IllegalStateException(e);
}
}
+
+ @Override
+ public String toString() {
+ return "ConnectionFactoryConfig{" +
+ "connectionFactoryClass='" + connectionFactoryClass + '\'' +
+ ", driverClass='" + driverClass + '\'' +
+ ", connectionUrl='" + connectionUrl + '\'' +
+ ", userName='" + userName + '\'' +
+ '}';
+ }
}
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java 2009-08-13 10:45:16 UTC (rev 662)
@@ -42,6 +42,9 @@
pooledDataSource.setJdbcUrl(config.getConnectionUrl());
pooledDataSource.setUser(config.getUserName());
pooledDataSource.setPassword(config.getPassword());
+ if (log.isTraceEnabled()) {
+ log.trace("Started connection factory with config: " + config);
+ }
}
private void logFileOverride() {
@@ -95,4 +98,6 @@
public ComboPooledDataSource getPooledDataSource() {
return pooledDataSource;
}
+
+
}
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java 2009-08-13 10:45:16 UTC (rev 662)
@@ -28,6 +28,9 @@
this.connectionUrl = config.getConnectionUrl();
this.userName = config.getUserName();
this.password = config.getPassword();
+ if (log.isTraceEnabled()) {
+ log.trace("Starting connection " + this);
+ }
}
public void stop() {
@@ -78,4 +81,12 @@
public String getPassword() {
return password;
}
+
+ @Override
+ public String toString() {
+ return "SimpleConnectionFactory{" +
+ "connectionUrl='" + connectionUrl + '\'' +
+ ", userName='" + userName + '\'' +
+ "} " + super.toString();
+ }
}
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java 2009-08-13 10:45:16 UTC (rev 662)
@@ -28,7 +28,7 @@
public class TableNameUniquenessTest {
public void testForJdbcStringBasedCacheStore() throws Exception {
- CacheManager cm = new DefaultCacheManager("string-based.xml");
+ CacheManager cm = new DefaultCacheManager("configs/string-based.xml");
Cache first = cm.getCache("first");
Cache second = cm.getCache("second");
@@ -54,7 +54,7 @@
}
public void testForJdbcBinaryCacheStore() throws Exception {
- CacheManager cm = new DefaultCacheManager("binary.xml");
+ CacheManager cm = new DefaultCacheManager("configs/binary.xml");
Cache first = cm.getCache("first");
Cache second = cm.getCache("second");
@@ -73,7 +73,7 @@
}
public void testForMixedCacheStore() throws Exception {
- CacheManager cm = new DefaultCacheManager("mixed.xml");
+ CacheManager cm = new DefaultCacheManager("configs/mixed.xml");
Cache first = cm.getCache("first");
Cache second = cm.getCache("second");
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java 2009-08-13 10:45:16 UTC (rev 662)
@@ -8,11 +8,8 @@
import org.infinispan.loaders.jdbc.connectionfactory.PooledConnectionFactory;
import java.sql.Connection;
-import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicInteger;
@@ -33,12 +30,12 @@
static {
try {
- Class.forName("org.hsqldb.jdbcDriver");
+ Class.forName("org.h2.Driver");
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
- realConfig.setDriverClass("org.hsqldb.jdbcDriver");
- realConfig.setConnectionUrl("jdbc:hsqldb:mem:infinispan");
+ realConfig.setDriverClass("org.h2.Driver");
+ realConfig.setConnectionUrl("jdbc:h2:mem:infinispan;DB_CLOSE_DELAY=-1");
realConfig.setConnectionFactoryClass(PooledConnectionFactory.class.getName());
realConfig.setUserName("sa");
}
@@ -51,29 +48,35 @@
public static void shutdownInMemoryDatabase(ConnectionFactoryConfig config) {
- Connection conn = null;
- Statement st = null;
- try {
- String shutDownConnection = getShutdownUrl(config);
- String url = config.getConnectionUrl();
- assert url != null;
- conn = DriverManager.getConnection(shutDownConnection);
- st = conn.createStatement();
- st.execute("SHUTDOWN");
- }
- catch (Throwable e) {
- throw new IllegalStateException(e);
- }
- finally {
- try {
- conn.close();
- st.close();
- }
- catch (SQLException e) {
- e.printStackTrace();
- }
- }
+
+// Connection conn = null;
+// Statement st = null;
+// try {
+// String shutDownConnection = getShutdownUrl(config);
+// String url = config.getConnectionUrl();
+// assert url != null;
+// try {
+// conn = DriverManager.getConnection(shutDownConnection);
+// } catch (SQLException e) {
+// //expected
+// }
+//// st = conn.createStatement();
+//// st.execute("SHUTDOWN");
+// }
+// catch (Throwable e) {
+// throw new IllegalStateException(e);
+// }
+// finally {
+//// try {
+////// conn.close();
+////// st.close();
+//// }
+//// catch (SQLException e) {
+//// e.printStackTrace();
+//// }
+// }
+
}
public static String getDatabaseName(Properties prop) {
@@ -100,7 +103,7 @@
Pattern pattern = Pattern.compile("infinispan");
Matcher matcher = pattern.matcher(jdbcUrl);
boolean found = matcher.find();
- assert found : String.format("%1s not found in %1s", pattern, jdbcUrl);
+ assert found : String.format("%1s not found in %2s", pattern, jdbcUrl);
String newJdbcUrl = matcher.replaceFirst(extractTestName() + userIndex.incrementAndGet());
result.setConnectionUrl(newJdbcUrl);
return result;
@@ -121,7 +124,7 @@
public static TableManipulation buildDefaultTableManipulation() {
return new TableManipulation("ID_COLUMN", "VARCHAR(255)", "ISPN_JDBC", "DATA_COLUMN",
- "BINARY", "TIMESTAMP_COLUMN", "BIGINT");
+ "BLOB", "TIMESTAMP_COLUMN", "BIGINT");
}
Deleted: trunk/cachestore/jdbc/src/test/resources/binary.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/binary.xml 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/src/test/resources/binary.xml 2009-08-13 10:45:16 UTC (rev 662)
@@ -1,75 +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.SimpleConnectionFactory"/>
- <property name="connectionUrl" value="jdbc:hsqldb:mem:infinispan_binary_based"/>
- <property name="userName" value="sa"/>
- <property name="driverClass" value="org.hsqldb.jdbcDriver"/>
- <property name="idColumnType" value="VARCHAR(255)"/>
- <property name="dataColumnType" value="BINARY"/>
- <property name="dropTableOnExit" value="false"/>
- <property name="createTableOnStart" value="true"/>
- </properties>
- </loader>
- </loaders>
-
- </default>
-
-
- <namedCache name="first"/>
-
- <namedCache name="second"/>
-
- </infinispan>
Added: trunk/cachestore/jdbc/src/test/resources/c3p0.properties
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/c3p0.properties (rev 0)
+++ trunk/cachestore/jdbc/src/test/resources/c3p0.properties 2009-08-13 10:45:16 UTC (rev 662)
@@ -0,0 +1,2 @@
+#c3p0.preferredTestQuery=SELECT * FROM INFORMATION_SCHEMA.SYSTEM_TABLES
+#c3p0.testConnectionOnCheckout=true
\ No newline at end of file
Copied: trunk/cachestore/jdbc/src/test/resources/configs/binary.xml (from rev 659, trunk/cachestore/jdbc/src/test/resources/binary.xml)
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/binary.xml (rev 0)
+++ trunk/cachestore/jdbc/src/test/resources/configs/binary.xml 2009-08-13 10:45:16 UTC (rev 662)
@@ -0,0 +1,75 @@
+<?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.PooledConnectionFactory"/>
+ <property name="connectionUrl" value="jdbc:hsqldb:mem:infinispan_binary_based"/>
+ <property name="userName" value="sa"/>
+ <property name="driverClass" value="org.hsqldb.jdbcDriver"/>
+ <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>
Property changes on: trunk/cachestore/jdbc/src/test/resources/configs/binary.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/cachestore/jdbc/src/test/resources/configs/mixed.xml (from rev 659, trunk/cachestore/jdbc/src/test/resources/mixed.xml)
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/mixed.xml (rev 0)
+++ trunk/cachestore/jdbc/src/test/resources/configs/mixed.xml 2009-08-13 10:45:16 UTC (rev 662)
@@ -0,0 +1,87 @@
+<?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.PooledConnectionFactory"/>
+ <property name="connectionUrl" value="jdbc:hsqldb:mem:infinispan_mixed_cs"/>
+ <property name="userName" value="sa"/>
+ <property name="driverClass" value="org.hsqldb.jdbcDriver"/>
+ <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>
Property changes on: trunk/cachestore/jdbc/src/test/resources/configs/mixed.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: trunk/cachestore/jdbc/src/test/resources/configs/string-based.xml (from rev 659, trunk/cachestore/jdbc/src/test/resources/string-based.xml)
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/string-based.xml (rev 0)
+++ trunk/cachestore/jdbc/src/test/resources/configs/string-based.xml 2009-08-13 10:45:16 UTC (rev 662)
@@ -0,0 +1,76 @@
+<?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.PooledConnectionFactory"/>
+ <property name="connectionUrl" value="jdbc:hsqldb:mem:infinispan_string_based"/>
+ <property name="userName" value="sa"/>
+ <property name="driverClass" value="org.hsqldb.jdbcDriver"/>
+ <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>
Property changes on: trunk/cachestore/jdbc/src/test/resources/configs/string-based.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/cachestore/jdbc/src/test/resources/mixed.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/mixed.xml 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/src/test/resources/mixed.xml 2009-08-13 10:45:16 UTC (rev 662)
@@ -1,87 +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.SimpleConnectionFactory"/>
- <property name="connectionUrl" value="jdbc:hsqldb:mem:infinispan_mixed_cs"/>
- <property name="userName" value="sa"/>
- <property name="driverClass" value="org.hsqldb.jdbcDriver"/>
- <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/string-based.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/string-based.xml 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/cachestore/jdbc/src/test/resources/string-based.xml 2009-08-13 10:45:16 UTC (rev 662)
@@ -1,78 +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.SimpleConnectionFactory"/>
- <property name="connectionUrl"
- value="org.infinispan.loaders.jdbc.connectionfactory.SimpleConnectionFactory"/>
- <property name="connectionUrl" value="jdbc:hsqldb:mem:infinispan_string_based"/>
- <property name="userName" value="sa"/>
- <property name="driverClass" value="org.hsqldb.jdbcDriver"/>
- <property name="idColumnType" value="VARCHAR(255)"/>
- <property name="dataColumnType" value="BINARY"/>
- <property name="dropTableOnExit" value="false"/>
- <property name="createTableOnStart" value="true"/>
- </properties>
- </loader>
- </loaders>
-
- </default>
-
-
- <namedCache name="first"/>
-
- <namedCache name="second"/>
-
-</infinispan>
Modified: trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java 2009-08-12 16:51:00 UTC (rev 661)
+++ trunk/core/src/test/java/org/infinispan/test/testng/SuiteResourcesAndLogTest.java 2009-08-13 10:45:16 UTC (rev 662)
@@ -43,6 +43,7 @@
}
log("java.net.preferIpv4Stack = " + preferIpV4);
log("java.net.preferIpv6Stack = " + System.getProperty("java.net.preferIpv6Stack"));
+ log("MAVEN_OPTS = " + System.getProperty("MAVEN_OPTS"));
log("~~~~~~~~~~~~~~~~~~~~~~~~~ ENVIRONMENT INFO ~~~~~~~~~~~~~~~~~~~~~~~~~~");
}
More information about the infinispan-commits
mailing list