[infinispan-commits] Infinispan SVN: r2341 - in branches/4.2.x: cachestore and 29 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue Sep 7 12:15:52 EDT 2010
Author: mircea.markus
Date: 2010-09-07 12:15:51 -0400 (Tue, 07 Sep 2010)
New Revision: 2341
Modified:
branches/4.2.x/cachestore/bdbje/pom.xml
branches/4.2.x/cachestore/cloud/pom.xml
branches/4.2.x/cachestore/jdbc/pom.xml
branches/4.2.x/cachestore/jdbm/pom.xml
branches/4.2.x/cachestore/pom.xml
branches/4.2.x/cachestore/remote/pom.xml
branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
branches/4.2.x/client/hotrod-client/pom.xml
branches/4.2.x/core/pom.xml
branches/4.2.x/core/src/main/java/org/infinispan/Version.java
branches/4.2.x/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
branches/4.2.x/core/src/test/resources/configs/named-cache-test.xml
branches/4.2.x/demos/directory/pom.xml
branches/4.2.x/demos/ec2-ui/pom.xml
branches/4.2.x/demos/ec2/pom.xml
branches/4.2.x/demos/gridfs-webdav/pom.xml
branches/4.2.x/demos/gui/pom.xml
branches/4.2.x/demos/lucene-directory-demo/pom.xml
branches/4.2.x/jopr-plugin/pom.xml
branches/4.2.x/lucene-directory/pom.xml
branches/4.2.x/parent/pom.xml
branches/4.2.x/pom.xml
branches/4.2.x/query/pom.xml
branches/4.2.x/server/core/pom.xml
branches/4.2.x/server/hotrod/pom.xml
branches/4.2.x/server/memcached/pom.xml
branches/4.2.x/server/pom.xml
branches/4.2.x/server/rest/pom.xml
branches/4.2.x/server/websocket/pom.xml
branches/4.2.x/tools/pom.xml
branches/4.2.x/tree/pom.xml
Log:
[ISPN-628] - Updated conf&all to reflect new version
Modified: branches/4.2.x/cachestore/bdbje/pom.xml
===================================================================
--- branches/4.2.x/cachestore/bdbje/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/cachestore/bdbje/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/cachestore/cloud/pom.xml
===================================================================
--- branches/4.2.x/cachestore/cloud/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/cachestore/cloud/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-cloud</artifactId>
Modified: branches/4.2.x/cachestore/jdbc/pom.xml
===================================================================
--- branches/4.2.x/cachestore/jdbc/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/cachestore/jdbc/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/cachestore/jdbm/pom.xml
===================================================================
--- branches/4.2.x/cachestore/jdbm/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/cachestore/jdbm/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-jdbm</artifactId>
Modified: branches/4.2.x/cachestore/pom.xml
===================================================================
--- branches/4.2.x/cachestore/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/cachestore/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-parent</artifactId>
Modified: branches/4.2.x/cachestore/remote/pom.xml
===================================================================
--- branches/4.2.x/cachestore/remote/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/cachestore/remote/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>infinispan-cachestore-remote</artifactId>
Modified: branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
===================================================================
--- branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java 2010-09-07 16:15:51 UTC (rev 2341)
@@ -78,3 +78,5 @@
public void testLoadKeys() throws CacheLoaderException {
}
}
+
+
Modified: branches/4.2.x/client/hotrod-client/pom.xml
===================================================================
--- branches/4.2.x/client/hotrod-client/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/client/hotrod-client/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/core/pom.xml
===================================================================
--- branches/4.2.x/core/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/core/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/core/src/main/java/org/infinispan/Version.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/Version.java 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/core/src/main/java/org/infinispan/Version.java 2010-09-07 16:15:51 UTC (rev 2341)
@@ -31,10 +31,10 @@
*/
@Immutable
public class Version {
- public static final String version = "4.1.0.SNAPSHOT";
- public static final String codename = "Radegast";
+ public static final String version = "4.2.0.SNAPSHOT";
+ public static final String codename = "Ursus";
public static final String projectName = "Infinispan";
- static final byte[] version_id = {'0', '4', '1', '0', 'S'};
+ static final byte[] version_id = {'0', '4', '2', '0', 'S'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
private static final int MAJOR_MASK = 0x00f800;
Modified: branches/4.2.x/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java 2010-09-07 16:15:51 UTC (rev 2341)
@@ -53,6 +53,7 @@
private static final int VERSION_400 = 400;
private static final int VERSION_410 = 410;
+ private static final int VERSION_420 = 420;
private static final int CUSTOM_MARSHALLER = 999;
private final JBossMarshaller defaultMarshaller;
@@ -119,8 +120,8 @@
public ObjectOutput startObjectOutput(OutputStream os, boolean isReentrant) throws IOException {
ObjectOutput out = defaultMarshaller.startObjectOutput(os, isReentrant);
try {
- out.writeShort(VERSION_410);
- if (trace) log.trace("Wrote version {0}", VERSION_410);
+ out.writeShort(VERSION_420);
+ if (trace) log.trace("Wrote version {0}", VERSION_420);
} catch (Exception e) {
finishObjectOutput(out);
log.error("Unable to read version id from first two bytes of stream, barfing.");
Modified: branches/4.2.x/core/src/test/resources/configs/named-cache-test.xml
===================================================================
--- branches/4.2.x/core/src/test/resources/configs/named-cache-test.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/core/src/test/resources/configs/named-cache-test.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -54,7 +54,7 @@
</default>
<namedCache name="transactional">
- <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" useEagerLocking="true"/>
+ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup" useEagerLocking="true" eagerLockSingleNode="true"/>
</namedCache>
<namedCache name="syncRepl">
Modified: branches/4.2.x/demos/directory/pom.xml
===================================================================
--- branches/4.2.x/demos/directory/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/demos/directory/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/demos/ec2/pom.xml
===================================================================
--- branches/4.2.x/demos/ec2/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/demos/ec2/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/demos/ec2-ui/pom.xml
===================================================================
--- branches/4.2.x/demos/ec2-ui/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/demos/ec2-ui/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/demos/gridfs-webdav/pom.xml
===================================================================
--- branches/4.2.x/demos/gridfs-webdav/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/demos/gridfs-webdav/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/demos/gui/pom.xml
===================================================================
--- branches/4.2.x/demos/gui/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/demos/gui/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/demos/lucene-directory-demo/pom.xml
===================================================================
--- branches/4.2.x/demos/lucene-directory-demo/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/demos/lucene-directory-demo/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/jopr-plugin/pom.xml
===================================================================
--- branches/4.2.x/jopr-plugin/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/jopr-plugin/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/lucene-directory/pom.xml
===================================================================
--- branches/4.2.x/lucene-directory/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/lucene-directory/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/parent/pom.xml
===================================================================
--- branches/4.2.x/parent/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/parent/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<name>Infinispan Common Parent</name>
<description>Infinispan common parent POM module</description>
<url>http://www.infinispan.org</url>
Modified: branches/4.2.x/pom.xml
===================================================================
--- branches/4.2.x/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/query/pom.xml
===================================================================
--- branches/4.2.x/query/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/query/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/server/core/pom.xml
===================================================================
--- branches/4.2.x/server/core/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/server/core/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/server/hotrod/pom.xml
===================================================================
--- branches/4.2.x/server/hotrod/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/server/hotrod/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/server/memcached/pom.xml
===================================================================
--- branches/4.2.x/server/memcached/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/server/memcached/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/server/pom.xml
===================================================================
--- branches/4.2.x/server/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/server/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/server/rest/pom.xml
===================================================================
--- branches/4.2.x/server/rest/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/server/rest/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/server/websocket/pom.xml
===================================================================
--- branches/4.2.x/server/websocket/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/server/websocket/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-server-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/tools/pom.xml
===================================================================
--- branches/4.2.x/tools/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/tools/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: branches/4.2.x/tree/pom.xml
===================================================================
--- branches/4.2.x/tree/pom.xml 2010-09-07 14:53:38 UTC (rev 2340)
+++ branches/4.2.x/tree/pom.xml 2010-09-07 16:15:51 UTC (rev 2341)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
More information about the infinispan-commits
mailing list