[infinispan-commits] Infinispan SVN: r1919 - in trunk: cachestore and 27 other directories.

infinispan-commits at lists.jboss.org infinispan-commits at lists.jboss.org
Wed Jun 16 12:48:28 EDT 2010


Author: manik.surtani at jboss.com
Date: 2010-06-16 12:48:27 -0400 (Wed, 16 Jun 2010)
New Revision: 1919

Modified:
   trunk/cachestore/bdbje/pom.xml
   trunk/cachestore/cloud/pom.xml
   trunk/cachestore/jdbc/pom.xml
   trunk/cachestore/jdbm/pom.xml
   trunk/cachestore/pom.xml
   trunk/cachestore/remote/pom.xml
   trunk/client/hotrod-client/pom.xml
   trunk/core/pom.xml
   trunk/core/src/main/java/org/infinispan/Version.java
   trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
   trunk/demos/directory/pom.xml
   trunk/demos/ec2-ui/pom.xml
   trunk/demos/ec2/pom.xml
   trunk/demos/gridfs-webdav/pom.xml
   trunk/demos/gui/pom.xml
   trunk/demos/lucene-directory-demo/pom.xml
   trunk/jopr-plugin/pom.xml
   trunk/lucene-directory/pom.xml
   trunk/parent/pom.xml
   trunk/pom.xml
   trunk/query/pom.xml
   trunk/server/core/pom.xml
   trunk/server/hotrod/pom.xml
   trunk/server/memcached/pom.xml
   trunk/server/pom.xml
   trunk/server/rest/pom.xml
   trunk/server/websocket/pom.xml
   trunk/tools/pom.xml
   trunk/tree/pom.xml
Log:
Trunk is now the baseline for 5.0.0

Modified: trunk/cachestore/bdbje/pom.xml
===================================================================
--- trunk/cachestore/bdbje/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/cachestore/bdbje/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 

Modified: trunk/cachestore/cloud/pom.xml
===================================================================
--- trunk/cachestore/cloud/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/cachestore/cloud/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-cloud</artifactId>

Modified: trunk/cachestore/jdbc/pom.xml
===================================================================
--- trunk/cachestore/jdbc/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/cachestore/jdbc/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 

Modified: trunk/cachestore/jdbm/pom.xml
===================================================================
--- trunk/cachestore/jdbm/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/cachestore/jdbm/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-jdbm</artifactId>

Modified: trunk/cachestore/pom.xml
===================================================================
--- trunk/cachestore/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/cachestore/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-parent</artifactId>

Modified: trunk/cachestore/remote/pom.xml
===================================================================
--- trunk/cachestore/remote/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/cachestore/remote/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-remote</artifactId>

Modified: trunk/client/hotrod-client/pom.xml
===================================================================
--- trunk/client/hotrod-client/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/client/hotrod-client/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
    <properties>

Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/core/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 

Modified: trunk/core/src/main/java/org/infinispan/Version.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/Version.java	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/core/src/main/java/org/infinispan/Version.java	2010-06-16 16:48:27 UTC (rev 1919)
@@ -31,10 +31,10 @@
  */
 @Immutable
 public class Version {
-   public static final String version = "4.1.0.SNAPSHOT";
+   public static final String version = "5.0.0.SNAPSHOT";
    public static final String codename = "Radegast";
    public static final String projectName = "Infinispan";
-   static final byte[] version_id = {'0', '4', '1', '0', 'S'};
+   static final byte[] version_id = {'0', '5', '0', '0', 'S'};
    private static final int MAJOR_SHIFT = 11;
    private static final int MINOR_SHIFT = 6;
    private static final int MAJOR_MASK = 0x00f800;

Modified: trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java	2010-06-16 16:48:27 UTC (rev 1919)
@@ -52,8 +52,9 @@
    private static final Log log = LogFactory.getLog(VersionAwareMarshaller.class);
    private boolean trace = log.isTraceEnabled();
 
-   private static final int VERSION_400 = 400;
-   private static final int VERSION_410 = 410;
+//   private static final int VERSION_400 = 400;
+//   private static final int VERSION_410 = 410;
+   private static final int VERSION_500 = 500;
    private static final int CUSTOM_MARSHALLER = 999;
 
    private final JBossMarshaller defaultMarshaller;
@@ -117,8 +118,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_500);
+         if (trace) log.trace("Wrote version {0}", VERSION_500);
       } catch (Exception e) {
          finishObjectOutput(out);
          log.error("Unable to read version id from first two bytes of stream, barfing.");

Modified: trunk/demos/directory/pom.xml
===================================================================
--- trunk/demos/directory/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/demos/directory/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 

Modified: trunk/demos/ec2/pom.xml
===================================================================
--- trunk/demos/ec2/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/demos/ec2/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.infinispan</groupId>
 		<artifactId>infinispan-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 

Modified: trunk/demos/ec2-ui/pom.xml
===================================================================
--- trunk/demos/ec2-ui/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/demos/ec2-ui/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.infinispan</groupId>
 		<artifactId>infinispan-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 

Modified: trunk/demos/gridfs-webdav/pom.xml
===================================================================
--- trunk/demos/gridfs-webdav/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/demos/gridfs-webdav/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 

Modified: trunk/demos/gui/pom.xml
===================================================================
--- trunk/demos/gui/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/demos/gui/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 

Modified: trunk/demos/lucene-directory-demo/pom.xml
===================================================================
--- trunk/demos/lucene-directory-demo/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/demos/lucene-directory-demo/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 

Modified: trunk/jopr-plugin/pom.xml
===================================================================
--- trunk/jopr-plugin/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/jopr-plugin/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -9,7 +9,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 

Modified: trunk/lucene-directory/pom.xml
===================================================================
--- trunk/lucene-directory/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/lucene-directory/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/parent/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -4,7 +4,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.infinispan</groupId>
    <artifactId>infinispan-parent</artifactId>
-   <version>4.1.0-SNAPSHOT</version>
+   <version>5.0.0-SNAPSHOT</version>
    <name>Infinispan Common Parent</name>
    <description>Infinispan common parent POM module</description>
    <url>http://www.infinispan.org</url>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>parent/pom.xml</relativePath>
    </parent>
 

Modified: trunk/query/pom.xml
===================================================================
--- trunk/query/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/query/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 

Modified: trunk/server/core/pom.xml
===================================================================
--- trunk/server/core/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/server/core/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 

Modified: trunk/server/hotrod/pom.xml
===================================================================
--- trunk/server/hotrod/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/server/hotrod/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 

Modified: trunk/server/memcached/pom.xml
===================================================================
--- trunk/server/memcached/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/server/memcached/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/server/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
    

Modified: trunk/server/rest/pom.xml
===================================================================
--- trunk/server/rest/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/server/rest/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 

Modified: trunk/server/websocket/pom.xml
===================================================================
--- trunk/server/websocket/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/server/websocket/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 

Modified: trunk/tools/pom.xml
===================================================================
--- trunk/tools/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/tools/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 

Modified: trunk/tree/pom.xml
===================================================================
--- trunk/tree/pom.xml	2010-06-16 16:47:04 UTC (rev 1918)
+++ trunk/tree/pom.xml	2010-06-16 16:48:27 UTC (rev 1919)
@@ -6,7 +6,7 @@
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>4.1.0-SNAPSHOT</version>
+      <version>5.0.0-SNAPSHOT</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 



More information about the infinispan-commits mailing list