[infinispan-commits] Infinispan SVN: r92 - in trunk/core/src: main/java/org/infinispan/atomic and 21 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue Apr 7 09:01:09 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-04-07 09:01:09 -0400 (Tue, 07 Apr 2009)
New Revision: 92
Added:
trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java
trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd
Removed:
trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java
trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd
Modified:
trunk/core/src/main/java/org/infinispan/Cache.java
trunk/core/src/main/java/org/infinispan/Version.java
trunk/core/src/main/java/org/infinispan/atomic/AtomicMap.java
trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
trunk/core/src/main/java/org/infinispan/context/InvocationContextImpl.java
trunk/core/src/main/java/org/infinispan/context/TransactionContextImpl.java
trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java
trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStore.java
trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStoreConfig.java
trunk/core/src/main/java/org/infinispan/lock/IsolationLevel.java
trunk/core/src/main/java/org/infinispan/logging/Log.java
trunk/core/src/main/java/org/infinispan/marshall/Marshaller.java
trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java
trunk/core/src/main/java/org/infinispan/transaction/GenericTransactionManagerLookup.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
trunk/core/src/main/release/JBossORG-EULA.txt
trunk/core/src/main/release/README-Demo.txt
trunk/core/src/main/release/README-libs.txt
trunk/core/src/main/release/README.txt
trunk/core/src/main/release/licenses/README-bdbje-lib.txt
trunk/core/src/main/resources/config-samples/all.xml
trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java
trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreTest.java
trunk/core/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java
trunk/core/src/test/resources/configs/named-cache-test.xml
trunk/core/src/test/resources/configs/string-property-replaced.xml
trunk/core/src/test/resources/log4j.xml
Log:
Renamed Infinispan -> Infinispan
Modified: trunk/core/src/main/java/org/infinispan/Cache.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/Cache.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/Cache.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -32,7 +32,7 @@
import java.util.concurrent.TimeUnit;
/**
- * The central interface of Infinispan. A Cache provides a highly concurrent, optionally distributed data structure with
+ * The central interface of Infinispan. A Cache provides a highly concurrent, optionally distributed data structure with
* additional features such as: <ul> <li>JTA transaction compatibility</li> <li>Eviction support to prevent evicting
* entries from memory to prevent {@link OutOfMemoryError}s</li> <li>Persisting entries to a {@link
* org.infinispan.loader.CacheStore}, either when they are evicted as an overflow, or all the time, to maintain persistent
@@ -46,7 +46,7 @@
* Also, like most {@link java.util.concurrent.ConcurrentMap} implementations, Cache does not support the use of
* <tt>null</tt> keys (although <tt>null</tt> values are allowed).
* <p/>
- * Please see the Infinispan documentation for more details.
+ * Please see the <a href="http://www.jboss.org/infinispan/docs">Infinispan documentation</a> for more details.
* <p/>
*
* @author Mircea.Markus at jboss.com
Modified: trunk/core/src/main/java/org/infinispan/Version.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/Version.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/Version.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -24,17 +24,17 @@
import net.jcip.annotations.Immutable;
/**
- * Contains version information about this release of Infinispan.
+ * Contains version information about this release of Infinispan.
*
* @author Bela Ban
* @since 4.0
*/
@Immutable
public class Version {
- public static final String version = "1.0.0.SNAPSHOT";
+ public static final String version = "4.0.0.SNAPSHOT";
public static final String codename = "Starobrno";
- public static final String projectName = "Infinispan";
- static final byte[] version_id = {'0', '1', '0', '0', 'S'};
+ public static final String projectName = "Infinispan";
+ static final byte[] version_id = {'0', '4', '0', '0', 'S'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
private static final int MAJOR_MASK = 0x00f800;
@@ -49,7 +49,7 @@
System.out.println();
System.out.println("\nVersion: \t" + version);
System.out.println("Codename: \t" + codename);
- System.out.println("History: \t(see http://jira.jboss.org for details)\n");
+ System.out.println("History: \t(see https://jira.jboss.org/jira/browse/ISPN for details)\n");
}
/**
Modified: trunk/core/src/main/java/org/infinispan/atomic/AtomicMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/atomic/AtomicMap.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/atomic/AtomicMap.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -24,7 +24,7 @@
import java.util.Map;
/**
- * This is a special type of Map geared for use in Infinispan. This map type supports Infinispan atomicizing writes
+ * This is a special type of Map geared for use in Infinispan. This map type supports Infinispan atomicizing writes
* on the cache such that a coarse grained locking is used if this map is stored in the cache, such that the entire map
* is locked for writes or is isolated for safe concurrent read.
* <p/>
Modified: trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/config/GlobalConfiguration.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -46,7 +46,7 @@
private String transportClass = null; // this defaults to a non-clustered cache.
private TypedProperties transportProperties = EMPTY_PROPERTIES;
private Configuration defaultConfiguration;
- private String clusterName = "Infinispan-Cluster";
+ private String clusterName = "Infinispan-Cluster";
private ShutdownHookBehavior shutdownHookBehavior = ShutdownHookBehavior.DEFAULT;
private short marshallVersion = DEFAULT_MARSHALL_VERSION;
Modified: trunk/core/src/main/java/org/infinispan/context/InvocationContextImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/InvocationContextImpl.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/context/InvocationContextImpl.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -26,7 +26,7 @@
import org.infinispan.transaction.TransactionTable;
import org.infinispan.util.BidirectionalLinkedHashMap;
import org.infinispan.util.BidirectionalMap;
-import org.infinispan.util.InfinispanCollections;
+import org.infinispan.util.InfinispanCollections;
import javax.transaction.Transaction;
import java.util.Map;
@@ -103,7 +103,7 @@
public BidirectionalMap<Object, CacheEntry> getLookedUpEntries() {
if (transactionContext != null) return transactionContext.getLookedUpEntries();
return (BidirectionalMap<Object, CacheEntry>)
- (lookedUpEntries == null ? InfinispanCollections.emptyBidirectionalMap() : lookedUpEntries);
+ (lookedUpEntries == null ? InfinispanCollections.emptyBidirectionalMap() : lookedUpEntries);
}
@SuppressWarnings("unchecked")
Modified: trunk/core/src/main/java/org/infinispan/context/TransactionContextImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/TransactionContextImpl.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/context/TransactionContextImpl.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -195,7 +195,7 @@
}
// public ReversibleOrderedSet<Object> getKeysLocked() {
-// return locks == null ? InfinispanCollections.emptyReversibleOrderedSet() : Immutables.immutableReversibleOrderedSetCopy(locks);
+// return locks == null ? InfinispanCollections.emptyReversibleOrderedSet() : Immutables.immutableReversibleOrderedSetCopy(locks);
// }
@Override
Modified: trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/factories/AbstractComponentFactory.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -30,7 +30,7 @@
import org.infinispan.logging.LogFactory;
/**
- * Factory that creates components used internally within Infinispan, and also wires dependencies into the components.
+ * Factory that creates components used internally within Infinispan, and also wires dependencies into the components.
* <p/>
* The {@link DefaultCacheFactory} is a special subclass of this, which bootstraps the construction of other components.
* When this class is loaded, it maintains a static list of known default factories for known components, which it then
Modified: trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/factories/AbstractComponentRegistry.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -689,7 +689,7 @@
addShutdownHook();
- getLog().info("Infinispan version: " + Version.printVersion());
+ getLog().info("Infinispan version: " + Version.printVersion());
state = ComponentStatus.RUNNING;
}
Modified: trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStore.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStore.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -194,7 +194,7 @@
public void start() throws CacheLoaderException {
super.start();
String location = config.getLocation();
- if (location == null || location.trim().length() == 0) location = "Infinispan-FileCacheStore"; // use relative path!
+ if (location == null || location.trim().length() == 0) location = "Infinispan-FileCacheStore"; // use relative path!
location += File.separator + cache.getName();
root = new File(location);
if (!root.exists()) {
Modified: trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStoreConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStoreConfig.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/loader/file/FileCacheStoreConfig.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -21,7 +21,7 @@
* @since 4.0
*/
public class FileCacheStoreConfig extends LockSupportCacheStoreConfig {
- String location = "Infinispan-FileCacheStore";
+ String location = "Infinispan-FileCacheStore";
private int streamBufferSize = 8192;
public FileCacheStoreConfig() {
Modified: trunk/core/src/main/java/org/infinispan/lock/IsolationLevel.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/lock/IsolationLevel.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/lock/IsolationLevel.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -26,7 +26,7 @@
* only supports {@link #READ_COMMITTED} and {@link #REPEATABLE_READ}, upgrading where
* possible.
* <p/>
- * Also note that Infinispan defaults to {@link #READ_COMMITTED}.
+ * Also note that Infinispan defaults to {@link #READ_COMMITTED}.
* <p/>
*
* @author (various)
Modified: trunk/core/src/main/java/org/infinispan/logging/Log.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/logging/Log.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/logging/Log.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -1,7 +1,7 @@
package org.infinispan.logging;
/**
- * Infinispan's log abstraction layer.
+ * Infinispan's log abstraction layer.
* <p/>
* Usage is very similar to Apache's Commons Logging, except that there are no additional dependencies beyond a JDK.
* <p/>
Modified: trunk/core/src/main/java/org/infinispan/marshall/Marshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/Marshaller.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/marshall/Marshaller.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -33,7 +33,7 @@
/**
* A marshaller is a class that is able to marshall and unmarshall objects efficiently.
* <p/>
- * The reason why this is implemented specially in Infinispan rather than resorting to Java serialization or even the more
+ * The reason why this is implemented specially in Infinispan rather than resorting to Java serialization or even the more
* efficient JBoss serialization is that a lot of efficiency can be gained when a majority of the serialization that
* occurs has to do with a small set of known types such as {@link org.infinispan.transaction.GlobalTransaction} or {@link
* org.infinispan.commands.ReplicableCommand}, and class type information can be replaced with simple magic numbers.
@@ -42,7 +42,7 @@
* <p/>
* In addition, using a marshaller allows adding additional data to the byte stream, such as context class loader
* information on which class loader to use to deserialize the object stream, or versioning information to allow streams
- * to interoperate between different versions of Infinispan (see {@link VersionAwareMarshaller}
+ * to interoperate between different versions of Infinispan (see {@link VersionAwareMarshaller}
* <p/>
* This interface is used to marshall {@link org.infinispan.commands.ReplicableCommand}s, their parameters and their
* response values.
Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/MarshallerAdapter.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -6,7 +6,7 @@
import org.jgroups.util.Buffer;
/**
- * Bridge between JGroups and Infinispan marshallers
+ * Bridge between JGroups and Infinispan marshallers
*
* @author Manik Surtani
* @since 4.0
Modified: trunk/core/src/main/java/org/infinispan/transaction/GenericTransactionManagerLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/GenericTransactionManagerLookup.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/transaction/GenericTransactionManagerLookup.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -96,9 +96,9 @@
if (tm != null)
return tm;
if (lookupFailed) {
- //fall back to a dummy from Infinispan
+ //fall back to a dummy from Infinispan
tm = DummyTransactionManager.getInstance();
- log.warn("Falling back to DummyTransactionManager from Infinispan");
+ log.warn("Falling back to DummyTransactionManager from Infinispan");
}
return tm;
}
Deleted: trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -1,110 +0,0 @@
-package org.infinispan.util;
-
-import java.util.AbstractSet;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-/**
- * Static helpers for Infinispan-specific collections
- *
- * @author Manik Surtani
- * @since 4.0
- */
-public class InfinispanCollections {
- private static final ReversibleOrderedSet EMPTY_ROS = new EmptyReversibleOrderedSet();
- private static final BidirectionalMap EMPTY_BIDI_MAP = new EmptyBidiMap();
-
- @SuppressWarnings("unchecked")
- public static final <T> ReversibleOrderedSet<T> emptyReversibleOrderedSet() {
- return (ReversibleOrderedSet<T>) EMPTY_ROS;
- }
-
- @SuppressWarnings("unchecked")
- public static final <K, V> BidirectionalMap<K, V> emptyBidirectionalMap() {
- return (BidirectionalMap<K, V>) EMPTY_BIDI_MAP;
- }
-
- private static final class EmptyReversibleOrderedSet extends AbstractSet implements ReversibleOrderedSet {
-
- Iterator it = new Iterator() {
-
- public boolean hasNext() {
- return false;
- }
-
- public Object next() {
- throw new NoSuchElementException();
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
- };
-
- public Iterator iterator() {
- return it;
- }
-
- public int size() {
- return 0;
- }
-
- public Iterator reverseIterator() {
- return it;
- }
- }
-
- private static final class EmptyBidiMap extends AbstractMap implements BidirectionalMap {
-
- public int size() {
- return 0;
- }
-
- public boolean isEmpty() {
- return true;
- }
-
- public boolean containsKey(Object key) {
- return false;
- }
-
- public boolean containsValue(Object value) {
- return false;
- }
-
- public Object get(Object key) {
- return null;
- }
-
- public Object put(Object key, Object value) {
- throw new UnsupportedOperationException();
- }
-
- public Object remove(Object key) {
- throw new UnsupportedOperationException();
- }
-
- public void putAll(Map t) {
- throw new UnsupportedOperationException();
- }
-
- public void clear() {
- throw new UnsupportedOperationException();
- }
-
- public ReversibleOrderedSet keySet() {
- return EMPTY_ROS;
- }
-
- public Collection values() {
- return Collections.emptySet();
- }
-
- public ReversibleOrderedSet entrySet() {
- return EMPTY_ROS;
- }
- }
-}
Copied: trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java (from rev 91, trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java)
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java (rev 0)
+++ trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -0,0 +1,110 @@
+package org.infinispan.util;
+
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+/**
+ * Static helpers for Infinispan-specific collections
+ *
+ * @author Manik Surtani
+ * @since 4.0
+ */
+public class InfinispanCollections {
+ private static final ReversibleOrderedSet EMPTY_ROS = new EmptyReversibleOrderedSet();
+ private static final BidirectionalMap EMPTY_BIDI_MAP = new EmptyBidiMap();
+
+ @SuppressWarnings("unchecked")
+ public static final <T> ReversibleOrderedSet<T> emptyReversibleOrderedSet() {
+ return (ReversibleOrderedSet<T>) EMPTY_ROS;
+ }
+
+ @SuppressWarnings("unchecked")
+ public static final <K, V> BidirectionalMap<K, V> emptyBidirectionalMap() {
+ return (BidirectionalMap<K, V>) EMPTY_BIDI_MAP;
+ }
+
+ private static final class EmptyReversibleOrderedSet extends AbstractSet implements ReversibleOrderedSet {
+
+ Iterator it = new Iterator() {
+
+ public boolean hasNext() {
+ return false;
+ }
+
+ public Object next() {
+ throw new NoSuchElementException();
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ };
+
+ public Iterator iterator() {
+ return it;
+ }
+
+ public int size() {
+ return 0;
+ }
+
+ public Iterator reverseIterator() {
+ return it;
+ }
+ }
+
+ private static final class EmptyBidiMap extends AbstractMap implements BidirectionalMap {
+
+ public int size() {
+ return 0;
+ }
+
+ public boolean isEmpty() {
+ return true;
+ }
+
+ public boolean containsKey(Object key) {
+ return false;
+ }
+
+ public boolean containsValue(Object value) {
+ return false;
+ }
+
+ public Object get(Object key) {
+ return null;
+ }
+
+ public Object put(Object key, Object value) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object remove(Object key) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void putAll(Map t) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void clear() {
+ throw new UnsupportedOperationException();
+ }
+
+ public ReversibleOrderedSet keySet() {
+ return EMPTY_ROS;
+ }
+
+ public Collection values() {
+ return Collections.emptySet();
+ }
+
+ public ReversibleOrderedSet entrySet() {
+ return EMPTY_ROS;
+ }
+ }
+}
Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -34,7 +34,7 @@
* constructed with a reference to the {@link InvocationContextContainer}, so it is able to determine whether the
* caller's "owner" reference is the current thread or a {@link GlobalTransaction} instance.
* <p/>
- * This makes this lock implementation very closely tied to Infinispan internals, but it provides for a very clean,
+ * This makes this lock implementation very closely tied to Infinispan internals, but it provides for a very clean,
* efficient and moreover familiar interface to work with, since it implements {@link java.util.concurrent.locks.Lock}.
* <p/>
* For the sake of performance, this lock only supports nonfair queueing.
Modified: trunk/core/src/main/release/JBossORG-EULA.txt
===================================================================
--- trunk/core/src/main/release/JBossORG-EULA.txt 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/release/JBossORG-EULA.txt 2009-04-07 13:01:09 UTC (rev 92)
@@ -11,7 +11,7 @@
(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
-(c) an optional download for Infinispan for the Berkeley DB for Java database, which is licensed under the
+(c) an optional download for Infinispan for the Berkeley DB for Java database, which is licensed under the
(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
it may purchase a license from Sleepycat Software);
Modified: trunk/core/src/main/release/README-Demo.txt
===================================================================
--- trunk/core/src/main/release/README-Demo.txt 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/release/README-Demo.txt 2009-04-07 13:01:09 UTC (rev 92)
@@ -1,10 +1,8 @@
-Infinispan GUI Demo
+Infinispan GUI Demo
-----------------
-Infinispan comes with a GUI demo, to visually demonstrate state being moved around a cluster.
+Infinispan comes with a GUI demo, to visually demonstrate state being moved around a cluster.
-The demo is available for download on
+The demo is available for download on thr Infinispan project page.
- http://sourceforge.net/project/showfiles.php?group_id=22866&package_id=102339
-
- Manik Surtani
Modified: trunk/core/src/main/release/README-libs.txt
===================================================================
--- trunk/core/src/main/release/README-libs.txt 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/release/README-libs.txt 2009-04-07 13:01:09 UTC (rev 92)
@@ -3,14 +3,14 @@
1) REQUIRED JARs
----------------
-The following JARs are REQUIRED for the proper operation of Infinispan, in addition to the infinispan.jar file:
+The following JARs are REQUIRED for the proper operation of Infinispan, in addition to the infinispan-core.jar file:
* jcip-annotations.jar - (http://jcip.net) - Annotations used to assert concurrency behaviour of internal classes.
-* jgroups.jar (http://jgroups.com) - Group communications library that is the backbone of Infinispan's replication.
+* jgroups.jar (http://jgroups.org) - Group communications library that is the backbone of Infinispan's replication.
Necessary even when the cache is run in LOCAL mode.
-* jboss-common-core.jar - JBoss utilities used by Infinispan. Version 2.0.5.GA or above needed if run with JDK 6.
+* jboss-common-core.jar - JBoss utilities used by Infinispan. Version 2.0.5.GA or above needed if run with JDK 6.
* jboss-logging-spi.jar - Required by jboss-common-core.
Modified: trunk/core/src/main/release/README.txt
===================================================================
--- trunk/core/src/main/release/README.txt 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/release/README.txt 2009-04-07 13:01:09 UTC (rev 92)
@@ -1,17 +1,17 @@
-Infinispan -- a replicated, transactional data grid
-================================================
+Infinispan -- a distributed, transactional, highly scalable data structure
+==========================================================================
Note:
- We offer different packaging for download:
- + infinispan-x.y.z-bin, just the core jar file and dependencies.
- + infinispan-x.y.z-all, everything including docs and tests.
- + infinispan-x.y.z-doc, just the documentation.
- + infinispan-x.y.z-src, a snapshot of the source tree.
+ // TODO write this up
Requirements:
- JDK 5.0 and up
Problems:
- - Please report problems on the Infinispan forum
- (http://www.jboss.org/forum.jsp?forum=157)
- or the JBoss dev mailing list
+ - Please report problems on the Infinispan user forum. Please see
+
+ http://www.jboss.org/infinispan/community
+
+ for details.
+
\ No newline at end of file
Modified: trunk/core/src/main/release/licenses/README-bdbje-lib.txt
===================================================================
--- trunk/core/src/main/release/licenses/README-bdbje-lib.txt 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/release/licenses/README-bdbje-lib.txt 2009-04-07 13:01:09 UTC (rev 92)
@@ -3,16 +3,16 @@
NAME: Sleepycat Berkeley DB Java Edition
PROJECT: http://www.oracle.com/database/berkeley-db/je/index.html
-PURPOSE: Used for Berkeley DB-based CacheLoader (org.infinispan.loader.bdbje.BdbjeCacheStore) in Infinispan
-RESTRICTION: Infinispan can use Berkeley DB Java Edition from Oracle
+PURPOSE: Used for Berkeley DB-based CacheLoader (org.infinispan.loader.bdbje.BdbjeCacheStore) in Infinispan
+RESTRICTION: Infinispan can use Berkeley DB Java Edition from Oracle
for persistent, reliable and transaction-protected
data storage. If you choose to use Berkeley DB Java Edition
- with Infinispan, you must comply with the terms of
+ with Infinispan, you must comply with the terms of
Oracle's public license, included in the file LICENSE-bdbje-lib.txt.
If you prefer not to release the source code for your own
application in order to comply with the Oracle public
license, you may purchase a different license for use of
- Berkeley DB Java Edition with Infinispan. For details,
+ Berkeley DB Java Edition with Infinispan. For details,
please go to:
http://www.oracle.com/database/berkeley-db/je/index.html
Modified: trunk/core/src/main/resources/config-samples/all.xml
===================================================================
--- trunk/core/src/main/resources/config-samples/all.xml 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/resources/config-samples/all.xml 2009-04-07 13:01:09 UTC (rev 92)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
<!-- *************************** -->
<!-- System-wide global settings -->
@@ -27,14 +27,14 @@
<property name="threadNamePrefix" value="ReplicationQueueThread"/>
</replicationQueueScheduledExecutor>
- <globalJmxStatistics enabled="true" jmxDomain="infinispan"/>
+ <globalJmxStatistics enabled="true" jmxDomain="infinispan"/>
<!--
If the transport is omitted, there is no way to create distributed or clustered caches.
There is no added cost to defining a transport but not creating a cache that uses one, since the transport
is created and initialized lazily.
-->
- <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="infinispan-cluster"
+ <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="infinispan-cluster"
distributedSyncTimeout="50000">
<!-- Note that the JGroups transport uses sensible defaults if no configuration property is defined. -->
<property name="configurationFile" value="udp.xml"/>
@@ -187,4 +187,4 @@
</customInterceptors>
-->
</namedCache>
-</infinispan>
+</infinispan>
Deleted: trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd
===================================================================
--- trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd 2009-04-07 13:01:09 UTC (rev 92)
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
- xmlns:tns="urn:infinispan:config:4.0" targetNamespace="urn:infinispan:config:4.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0">
-
- <xs:element name="infinispan" type="tns:cacheManagerConfigurationType"/>
-
- <xs:complexType name="cacheManagerConfigurationType">
- <xs:sequence>
- <xs:element name="global" type="tns:globalCacheConfigurationType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="default" type="tns:cacheConfigurationType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="namedCache" type="tns:cacheConfigurationType" maxOccurs="unbounded" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="globalCacheConfigurationType">
- <xs:all>
- <xs:element name="serialization" type="tns:sharedSerializationType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="globalJmxStatistics" type="tns:globalJmxStatisticsType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="transport" type="tns:transportConfigType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="asyncListenerExecutor" type="tns:executorConfigurationType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="asyncSerializationExecutor" type="tns:executorConfigurationType" minOccurs="0"
- maxOccurs="1"/>
- <xs:element name="evictionScheduledExecutor" type="tns:executorConfigurationType" minOccurs="0"
- maxOccurs="1"/>
- <xs:element name="replicationQueueScheduledExecutor" type="tns:executorConfigurationType" minOccurs="0"
- maxOccurs="1"/>
- <xs:element name="shutdown" type="tns:shutdownType" minOccurs="0" maxOccurs="1"/>
- </xs:all>
- </xs:complexType>
-
- <xs:complexType name="sharedSerializationType">
- <xs:attribute name="objectInputStreamPoolSize" type="tns:positiveInteger"/>
- <xs:attribute name="objectOutputStreamPoolSize" type="tns:positiveInteger"/>
- <xs:attribute name="version" type="xs:string"/>
- <xs:attribute name="marshallerClass" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="globalJmxStatisticsType">
- <xs:attribute name="enabled" type="tns:booleanType"/>
- <xs:attribute name="jmxDomain" type="xs:string"/>
- <xs:attribute name="mBeanServerLookup" type="xs:string"/>
- <xs:attribute name="allowDuplicateDomains" type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="executorConfigurationType">
- <xs:sequence>
- <xs:element name="property" minOccurs="0" maxOccurs="unbounded" type="tns:propertyType"/>
- </xs:sequence>
- <xs:attribute name="factory" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="cacheConfigurationType">
- <xs:all>
- <xs:element name="locking" type="tns:lockingType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="transaction" type="tns:transactionType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="jmxStatistics" type="tns:jmxStatisticsType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="lazyDeserialization" type="tns:lazyDeserialization" minOccurs="0" maxOccurs="1"/>
- <xs:element name="invocationBatching" type="tns:invocationBatchingType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="eviction" type="tns:evictionType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="expiration" type="tns:expirationType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="loaders" type="tns:loadersType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="customInterceptors" type="tns:customInterceptorsType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="clustering" type="tns:clusteringType" minOccurs="0" maxOccurs="1"/>
- </xs:all>
- <xs:attribute name="name" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="clusteringType">
- <xs:all>
- <xs:element name="sync" type="tns:syncType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="async" type="tns:asyncType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="stateRetrieval" type="tns:stateRetrievalType" minOccurs="0" maxOccurs="1"/>
- </xs:all>
- <xs:attribute name="mode">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern
- value="[Rr][Ee][Pp][Ll][Ii][Cc][Aa][Tt][Ii][Oo][Nn]|[Ii][Nn][Vv][Aa][Ll][Ii][Dd][Aa][Tt][Ii][Oo][Nn]|[Rr]|[Ii]|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
-
- <xs:complexType name="lockingType">
- <xs:attribute name="isolationLevel">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern
- value="[Ss][Ee][Rr][Ii][Aa][Ll][Ii][Zz][Aa][Bb][Ll][Ee]|[Rr][Ee][Pp][Ee][Aa][Tt][Aa][Bb][Ll][Ee]_[Rr][Ee][Aa][Dd]|[Rr][Ee][Aa][Dd]_[Cc][Oo][Mm][Mm][Ii][Tt][Tt][Ee][Dd]|[Nn][Oo][Nn][Ee]|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="lockAcquisitionTimeout" type="tns:positiveInteger"/>
- <xs:attribute name="writeSkewCheck" type="tns:booleanType"/>
- <xs:attribute name="useLockStriping" type="tns:booleanType"/>
- <xs:attribute name="concurrencyLevel" type="xs:integer"/>
- </xs:complexType>
-
- <xs:complexType name="transactionType">
- <xs:attribute name="transactionManagerLookupClass" type="xs:string"/>
- <xs:attribute name="syncRollbackPhase" type="tns:booleanType"/>
- <xs:attribute name="syncCommitPhase" type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="stateRetrievalType">
- <xs:attribute name="fetchInMemoryState" type="tns:booleanType"/>
- <xs:attribute name="timeout" type="tns:positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="shutdownType">
- <xs:attribute name="hookBehavior">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern
- value="[Dd][Ee][Ff][Aa][Uu][Ll][Tt]|[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|[Dd][Oo][Nn][Tt]_[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
-
- <xs:simpleType name="booleanType">
- <xs:restriction base="xs:string">
- <xs:pattern value="\$\{.*\}|[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="positiveInteger">
- <xs:restriction base="xs:string">
- <xs:pattern value="\$\{.*\}|\+?[0-9]*"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:complexType name="jmxStatisticsType">
- <xs:attribute name="enabled" type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="lazyDeserialization">
- <xs:attribute name="enabled" type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="invocationBatchingType">
- <xs:attribute name="enabled" type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="transportConfigType">
- <xs:sequence>
- <xs:element name="property" minOccurs="0" maxOccurs="unbounded" type="tns:propertyType"/>
- </xs:sequence>
- <xs:attribute name="transportClass" type="xs:string"/>
- <xs:attribute name="clusterName" type="xs:string"/>
- <xs:attribute name="distributedSyncTimeout" type="xs:long"/>
- </xs:complexType>
-
- <xs:complexType name="syncType">
- <xs:attribute name="replTimeout" type="tns:positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="asyncType">
- <xs:attribute name="useReplQueue" type="tns:booleanType"/>
- <xs:attribute name="replQueueInterval" type="tns:positiveInteger"/>
- <xs:attribute name="replQueueMaxElements" type="tns:positiveInteger"/>
- <xs:attribute name="useAsyncSerialization" type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="evictionType">
- <xs:attribute name="wakeUpInterval" type="tns:positiveInteger" use="required"/>
- <xs:attribute name="strategy">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern
- value="[Nn][Oo][Nn][Ee]|[Ff][Ii][Ff][Oo]|[Ll][Rr][Uu]|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="maxEntries" type="xs:positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="expirationType">
- <xs:attribute name="lifespan" type="tns:positiveInteger"/>
- <xs:attribute name="maxIdle" type="xs:positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="loadersType">
- <xs:sequence>
- <xs:element name="loader" maxOccurs="unbounded">
- <xs:complexType>
- <xs:all>
- <xs:element name="properties" type="tns:propertiesType"/>
- <xs:element name="singletonStore" minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:attribute name="enabled" type="tns:booleanType"/>
- <xs:attribute name="pushStateWhenCoordinator" type="tns:booleanType"/>
- <xs:attribute name="pushStateTimeout" type="xs:positiveInteger"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="async" minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:attribute name="enabled" type="tns:booleanType"/>
- <xs:attribute name="batchSize" type="xs:positiveInteger"/>
- <xs:attribute name="pollWait" type="xs:positiveInteger"/>
- <xs:attribute name="queueSize" type="xs:positiveInteger"/>
- <xs:attribute name="threadPoolSize" type="xs:positiveInteger"/>
- </xs:complexType>
- </xs:element>
- </xs:all>
- <xs:attribute name="class" type="xs:string"/>
- <xs:attribute name="fetchPersistentState" type="tns:booleanType"/>
- <xs:attribute name="ignoreModifications" type="tns:booleanType"/>
- <xs:attribute name="purgeOnStartup" type="tns:booleanType"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="preload" type="tns:booleanType"/>
- <xs:attribute name="passivation" type="tns:booleanType"/>
- <xs:attribute name="shared" type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="propertiesType">
- <xs:sequence>
- <xs:element name="property" minOccurs="0" maxOccurs="unbounded" type="tns:propertyType"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="customInterceptorsType">
- <xs:sequence>
- <xs:element name="interceptor" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="property" maxOccurs="unbounded" type="tns:propertyType" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="class" type="xs:string"/>
- <xs:attribute name="position">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="[Ff][Ii][Rr][Ss][Tt]|[Ll][Aa][Ss][Tt]"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="before" type="xs:string"/>
- <xs:attribute name="after" type="xs:string"/>
- <xs:attribute name="index" type="tns:positiveInteger"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="propertyType">
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="value" type="xs:string"/>
- </xs:complexType>
-</xs:schema>
-
Copied: trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd (from rev 88, trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd)
===================================================================
--- trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd (rev 0)
+++ trunk/core/src/main/resources/schema/infinispan-config-4.0.xsd 2009-04-07 13:01:09 UTC (rev 92)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
+ xmlns:tns="urn:infinispan:config:4.0" targetNamespace="urn:infinispan:config:4.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0">
+
+ <xs:element name="infinispan" type="tns:cacheManagerConfigurationType"/>
+
+ <xs:complexType name="cacheManagerConfigurationType">
+ <xs:sequence>
+ <xs:element name="global" type="tns:globalCacheConfigurationType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="default" type="tns:cacheConfigurationType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="namedCache" type="tns:cacheConfigurationType" maxOccurs="unbounded" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="globalCacheConfigurationType">
+ <xs:all>
+ <xs:element name="serialization" type="tns:sharedSerializationType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="globalJmxStatistics" type="tns:globalJmxStatisticsType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="transport" type="tns:transportConfigType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="asyncListenerExecutor" type="tns:executorConfigurationType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="asyncSerializationExecutor" type="tns:executorConfigurationType" minOccurs="0"
+ maxOccurs="1"/>
+ <xs:element name="evictionScheduledExecutor" type="tns:executorConfigurationType" minOccurs="0"
+ maxOccurs="1"/>
+ <xs:element name="replicationQueueScheduledExecutor" type="tns:executorConfigurationType" minOccurs="0"
+ maxOccurs="1"/>
+ <xs:element name="shutdown" type="tns:shutdownType" minOccurs="0" maxOccurs="1"/>
+ </xs:all>
+ </xs:complexType>
+
+ <xs:complexType name="sharedSerializationType">
+ <xs:attribute name="objectInputStreamPoolSize" type="tns:positiveInteger"/>
+ <xs:attribute name="objectOutputStreamPoolSize" type="tns:positiveInteger"/>
+ <xs:attribute name="version" type="xs:string"/>
+ <xs:attribute name="marshallerClass" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="globalJmxStatisticsType">
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ <xs:attribute name="jmxDomain" type="xs:string"/>
+ <xs:attribute name="mBeanServerLookup" type="xs:string"/>
+ <xs:attribute name="allowDuplicateDomains" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="executorConfigurationType">
+ <xs:sequence>
+ <xs:element name="property" minOccurs="0" maxOccurs="unbounded" type="tns:propertyType"/>
+ </xs:sequence>
+ <xs:attribute name="factory" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="cacheConfigurationType">
+ <xs:all>
+ <xs:element name="locking" type="tns:lockingType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="transaction" type="tns:transactionType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="jmxStatistics" type="tns:jmxStatisticsType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="lazyDeserialization" type="tns:lazyDeserialization" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="invocationBatching" type="tns:invocationBatchingType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="eviction" type="tns:evictionType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="expiration" type="tns:expirationType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="loaders" type="tns:loadersType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="customInterceptors" type="tns:customInterceptorsType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="clustering" type="tns:clusteringType" minOccurs="0" maxOccurs="1"/>
+ </xs:all>
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="clusteringType">
+ <xs:all>
+ <xs:element name="sync" type="tns:syncType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="async" type="tns:asyncType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="stateRetrieval" type="tns:stateRetrievalType" minOccurs="0" maxOccurs="1"/>
+ </xs:all>
+ <xs:attribute name="mode">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern
+ value="[Rr][Ee][Pp][Ll][Ii][Cc][Aa][Tt][Ii][Oo][Nn]|[Ii][Nn][Vv][Aa][Ll][Ii][Dd][Aa][Tt][Ii][Oo][Nn]|[Rr]|[Ii]|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="lockingType">
+ <xs:attribute name="isolationLevel">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern
+ value="[Ss][Ee][Rr][Ii][Aa][Ll][Ii][Zz][Aa][Bb][Ll][Ee]|[Rr][Ee][Pp][Ee][Aa][Tt][Aa][Bb][Ll][Ee]_[Rr][Ee][Aa][Dd]|[Rr][Ee][Aa][Dd]_[Cc][Oo][Mm][Mm][Ii][Tt][Tt][Ee][Dd]|[Nn][Oo][Nn][Ee]|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="lockAcquisitionTimeout" type="tns:positiveInteger"/>
+ <xs:attribute name="writeSkewCheck" type="tns:booleanType"/>
+ <xs:attribute name="useLockStriping" type="tns:booleanType"/>
+ <xs:attribute name="concurrencyLevel" type="xs:integer"/>
+ </xs:complexType>
+
+ <xs:complexType name="transactionType">
+ <xs:attribute name="transactionManagerLookupClass" type="xs:string"/>
+ <xs:attribute name="syncRollbackPhase" type="tns:booleanType"/>
+ <xs:attribute name="syncCommitPhase" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="stateRetrievalType">
+ <xs:attribute name="fetchInMemoryState" type="tns:booleanType"/>
+ <xs:attribute name="timeout" type="tns:positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="shutdownType">
+ <xs:attribute name="hookBehavior">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern
+ value="[Dd][Ee][Ff][Aa][Uu][Ll][Tt]|[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|[Dd][Oo][Nn][Tt]_[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:simpleType name="booleanType">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="\$\{.*\}|[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="positiveInteger">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="\$\{.*\}|\+?[0-9]*"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="jmxStatisticsType">
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="lazyDeserialization">
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="invocationBatchingType">
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="transportConfigType">
+ <xs:sequence>
+ <xs:element name="property" minOccurs="0" maxOccurs="unbounded" type="tns:propertyType"/>
+ </xs:sequence>
+ <xs:attribute name="transportClass" type="xs:string"/>
+ <xs:attribute name="clusterName" type="xs:string"/>
+ <xs:attribute name="distributedSyncTimeout" type="xs:long"/>
+ </xs:complexType>
+
+ <xs:complexType name="syncType">
+ <xs:attribute name="replTimeout" type="tns:positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="asyncType">
+ <xs:attribute name="useReplQueue" type="tns:booleanType"/>
+ <xs:attribute name="replQueueInterval" type="tns:positiveInteger"/>
+ <xs:attribute name="replQueueMaxElements" type="tns:positiveInteger"/>
+ <xs:attribute name="useAsyncSerialization" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="evictionType">
+ <xs:attribute name="wakeUpInterval" type="tns:positiveInteger" use="required"/>
+ <xs:attribute name="strategy">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern
+ value="[Nn][Oo][Nn][Ee]|[Ff][Ii][Ff][Oo]|[Ll][Rr][Uu]|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="maxEntries" type="xs:positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="expirationType">
+ <xs:attribute name="lifespan" type="tns:positiveInteger"/>
+ <xs:attribute name="maxIdle" type="xs:positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="loadersType">
+ <xs:sequence>
+ <xs:element name="loader" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:all>
+ <xs:element name="properties" type="tns:propertiesType"/>
+ <xs:element name="singletonStore" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ <xs:attribute name="pushStateWhenCoordinator" type="tns:booleanType"/>
+ <xs:attribute name="pushStateTimeout" type="xs:positiveInteger"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="async" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ <xs:attribute name="batchSize" type="xs:positiveInteger"/>
+ <xs:attribute name="pollWait" type="xs:positiveInteger"/>
+ <xs:attribute name="queueSize" type="xs:positiveInteger"/>
+ <xs:attribute name="threadPoolSize" type="xs:positiveInteger"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:all>
+ <xs:attribute name="class" type="xs:string"/>
+ <xs:attribute name="fetchPersistentState" type="tns:booleanType"/>
+ <xs:attribute name="ignoreModifications" type="tns:booleanType"/>
+ <xs:attribute name="purgeOnStartup" type="tns:booleanType"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="preload" type="tns:booleanType"/>
+ <xs:attribute name="passivation" type="tns:booleanType"/>
+ <xs:attribute name="shared" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesType">
+ <xs:sequence>
+ <xs:element name="property" minOccurs="0" maxOccurs="unbounded" type="tns:propertyType"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="customInterceptorsType">
+ <xs:sequence>
+ <xs:element name="interceptor" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="property" maxOccurs="unbounded" type="tns:propertyType" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="class" type="xs:string"/>
+ <xs:attribute name="position">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="[Ff][Ii][Rr][Ss][Tt]|[Ll][Aa][Ss][Tt]"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="before" type="xs:string"/>
+ <xs:attribute name="after" type="xs:string"/>
+ <xs:attribute name="index" type="tns:positiveInteger"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertyType">
+ <xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="value" type="xs:string"/>
+ </xs:complexType>
+</xs:schema>
+
Modified: trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/GlobalConfigurationParserTest.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -99,7 +99,7 @@
parser.configureSerialization(e, gc);
assert gc.getMarshallerClass().equals(VersionAwareMarshaller.class.getName());
- assert gc.getMarshallVersionString().equals("1.0");
+ assert gc.getMarshallVersionString().equals("4.0");
assert gc.getObjectInputStreamPoolSize() == 50;
assert gc.getObjectOutputStreamPoolSize() == 50;
}
Modified: trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/test/java/org/infinispan/jmx/JmxStatsFunctionalTest.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -181,7 +181,7 @@
localCache2.setExposeJmxStatistics(true);
cm2.defineCache("local_cache", localCache);
cm2.getCache("local_cache");
- assert existsObject("infinispan2:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan2:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
GlobalConfiguration globalConfiguration3 = GlobalConfiguration.getClusteredDefault();
globalConfiguration3.setExposeGlobalJmxStatistics(true);
@@ -192,7 +192,7 @@
localCache3.setExposeJmxStatistics(true);
cm3.defineCache("local_cache", localCache);
cm3.getCache("local_cache");
- assert existsObject("infinispan3:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan3:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
}
public void testUnregisterJmxInfoOnStop() {
@@ -234,15 +234,15 @@
remoteCache.setCacheMode(Configuration.CacheMode.REPL_SYNC);
cm2.defineCache("remote_cache", remoteCache);
cm2.getCache("remote_cache");
- assert existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
+ assert existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
cm2.stop();
assert existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
- assert !existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
+ assert !existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
cm.stop();
assert !existsObject("infinispan:cache-name=local_cache(local),jmx-resource=CacheMgmtInterceptor");
- assert !existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
+ assert !existsObject("infinispan2:cache-name=remote_cache(repl_sync),jmx-resource=CacheMgmtInterceptor");
}
static boolean existsObject(String s) {
Modified: trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreTest.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/test/java/org/infinispan/loader/AbstractCacheStoreTest.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -3,8 +3,8 @@
import static org.easymock.classextension.EasyMock.createMock;
import org.infinispan.util.ReflectionUtil;
import org.infinispan.util.concurrent.WithinThreadExecutor;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.util.concurrent.ExecutorService;
@@ -21,21 +21,20 @@
private AbstractCacheStore cs;
private AbstractCacheStoreConfig cfg;
- @BeforeTest
+ @BeforeMethod
public void setUp() throws NoSuchMethodException {
cs = createMock(AbstractCacheStore.class, AbstractCacheStore.class.getMethod("clear"));
cfg = new AbstractCacheStoreConfig();
cs.init(cfg, null, null);
}
- @AfterTest
+ @AfterMethod
public void tearDown() throws CacheLoaderException {
cs.stop();
cs = null;
cfg = null;
}
-
@Test
void testSynchExecutorIsSetWhenCfgPurgeSynchIsTrueOnStart() throws Exception {
cfg.setPurgeSynchronously(true);
@@ -44,12 +43,10 @@
assert service instanceof WithinThreadExecutor;
}
-
@Test
void testASynchExecutorIsDefaultOnStart() throws Exception {
cs.start();
ExecutorService service = (ExecutorService) ReflectionUtil.getValue(cs, "purgerService");
assert !(service instanceof WithinThreadExecutor);
}
-
}
Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java 2009-04-07 13:01:09 UTC (rev 92)
@@ -23,7 +23,7 @@
protected String moduleName = "core";
String dir = "src/test/java/org/infinispan";
- Pattern packageLinePattern = Pattern.compile("package org.infinispan[^;]*");
+ Pattern packageLinePattern = Pattern.compile("package org.infinispan[^;]*");
Pattern classLinePattern = Pattern.compile("(abstract\\s*)??(public\\s*)(abstract\\s*)??class [^\\s]*");
Pattern atAnnotationPattern = Pattern.compile("@Test[^)]*");
Pattern testNamePattern = Pattern.compile("testName\\s*=\\s*\"[^\"]*\"");
Modified: trunk/core/src/test/resources/configs/named-cache-test.xml
===================================================================
--- trunk/core/src/test/resources/configs/named-cache-test.xml 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/test/resources/configs/named-cache-test.xml 2009-04-07 13:01:09 UTC (rev 92)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
<global>
@@ -103,4 +103,4 @@
<jmxStatistics enabled="false"/>
</namedCache>
-</infinispan>
+</infinispan>
Modified: trunk/core/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- trunk/core/src/test/resources/configs/string-property-replaced.xml 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/test/resources/configs/string-property-replaced.xml 2009-04-07 13:01:09 UTC (rev 92)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
<!-- *************************** -->
<!-- System-wide global settings -->
@@ -38,4 +38,4 @@
<sync/>
</clustering>
</default>
-</infinispan>
+</infinispan>
Modified: trunk/core/src/test/resources/log4j.xml
===================================================================
--- trunk/core/src/test/resources/log4j.xml 2009-04-07 10:54:33 UTC (rev 91)
+++ trunk/core/src/test/resources/log4j.xml 2009-04-07 13:01:09 UTC (rev 92)
@@ -8,7 +8,7 @@
<!-- A time/date based rolling appender -->
<appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="infinispan.log"/>
+ <param name="File" value="infinispan.log"/>
<param name="Append" value="false"/>
<!-- Rollover at midnight each day -->
More information about the infinispan-commits
mailing list