[infinispan-commits] Infinispan SVN: r2586 - in tags/4.2.0.ALPHA4: cachestore and 28 other directories.

infinispan-commits at lists.jboss.org infinispan-commits at lists.jboss.org
Fri Oct 22 12:09:47 EDT 2010


Author: mircea.markus
Date: 2010-10-22 12:09:46 -0400 (Fri, 22 Oct 2010)
New Revision: 2586

Modified:
   tags/4.2.0.ALPHA4/cachestore/bdbje/pom.xml
   tags/4.2.0.ALPHA4/cachestore/cassandra/pom.xml
   tags/4.2.0.ALPHA4/cachestore/cloud/pom.xml
   tags/4.2.0.ALPHA4/cachestore/jdbc/pom.xml
   tags/4.2.0.ALPHA4/cachestore/jdbm/pom.xml
   tags/4.2.0.ALPHA4/cachestore/pom.xml
   tags/4.2.0.ALPHA4/cachestore/remote/pom.xml
   tags/4.2.0.ALPHA4/client/hotrod-client/pom.xml
   tags/4.2.0.ALPHA4/core/pom.xml
   tags/4.2.0.ALPHA4/core/src/main/java/org/infinispan/Version.java
   tags/4.2.0.ALPHA4/demos/directory/pom.xml
   tags/4.2.0.ALPHA4/demos/ec2-ui/pom.xml
   tags/4.2.0.ALPHA4/demos/ec2/pom.xml
   tags/4.2.0.ALPHA4/demos/gridfs-webdav/pom.xml
   tags/4.2.0.ALPHA4/demos/gui/pom.xml
   tags/4.2.0.ALPHA4/demos/lucene-directory-demo/pom.xml
   tags/4.2.0.ALPHA4/jopr-plugin/pom.xml
   tags/4.2.0.ALPHA4/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml
   tags/4.2.0.ALPHA4/lucene-directory/pom.xml
   tags/4.2.0.ALPHA4/parent/pom.xml
   tags/4.2.0.ALPHA4/pom.xml
   tags/4.2.0.ALPHA4/query/pom.xml
   tags/4.2.0.ALPHA4/server/core/pom.xml
   tags/4.2.0.ALPHA4/server/hotrod/pom.xml
   tags/4.2.0.ALPHA4/server/memcached/pom.xml
   tags/4.2.0.ALPHA4/server/pom.xml
   tags/4.2.0.ALPHA4/server/rest/pom.xml
   tags/4.2.0.ALPHA4/server/websocket/pom.xml
   tags/4.2.0.ALPHA4/tools/pom.xml
   tags/4.2.0.ALPHA4/tree/pom.xml
Log:
Infinispan Release Script: Updated version numbers

Modified: tags/4.2.0.ALPHA4/cachestore/bdbje/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/cachestore/bdbje/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/cachestore/bdbje/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -44,4 +42,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/cachestore/cassandra/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/cachestore/cassandra/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/cachestore/cassandra/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,11 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.infinispan</groupId>
 		<artifactId>infinispan-cachestore-parent</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
+		<version>4.2.0.ALPHA4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>infinispan-cachestore-cassandra</artifactId>
@@ -60,4 +59,4 @@
 			</snapshots>
 		</repository>
 	</repositories>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/cachestore/cloud/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/cachestore/cloud/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/cachestore/cloud/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-cloud</artifactId>
@@ -35,8 +33,8 @@
          <version>${version.jclouds}</version>
       </dependency>
 
-      <!-- =========================================================== -->
-      <!-- optional cloud provider plug-ins.  You'd need at least one! -->
+      
+      
       <dependency>
          <groupId>org.jclouds</groupId>
          <artifactId>jclouds-allblobstore</artifactId>
@@ -44,7 +42,7 @@
          <scope>optional</scope>
       </dependency>
 
-      <!-- =========================================================== -->
+      
 
       <dependency>
          <groupId>org.apache.commons</groupId>
@@ -121,4 +119,4 @@
          </properties>
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/cachestore/jdbc/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/cachestore/jdbc/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/cachestore/jdbc/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -29,7 +27,7 @@
          <scope>test</scope>
       </dependency>
 
-      <!-- for testing against MySQL -->
+      
       <dependency>
          <groupId>mysql</groupId>
          <artifactId>mysql-connector-java</artifactId>
@@ -53,4 +51,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/cachestore/jdbm/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/cachestore/jdbm/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/cachestore/jdbm/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-jdbm</artifactId>
@@ -18,7 +16,7 @@
 
    <dependencies>
       <dependency>
-         <!-- Contains fixes not officially released by JDBM group -->
+         
          <groupId>org.apache.directory.server</groupId>
          <artifactId>apacheds-jdbm</artifactId>
          <version>${version.apacheds.jdbm}</version>
@@ -50,4 +48,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/cachestore/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/cachestore/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/cachestore/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-parent</artifactId>
@@ -28,4 +26,4 @@
          <scope>test</scope>
       </dependency>
    </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/cachestore/remote/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/cachestore/remote/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/cachestore/remote/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-cachestore-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>infinispan-cachestore-remote</artifactId>
@@ -59,4 +57,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/client/hotrod-client/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/client/hotrod-client/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/client/hotrod-client/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -85,4 +83,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/core/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/core/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/core/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -23,10 +21,7 @@
          <version>${version.jgroups}</version>
       </dependency>
 
-      <!--
-         For the JTA 1.1 API; consuming projects can safely
-         exclude this and replace with any valid source of this API, such as a Java EE app server. 
-         -->
+      
       <dependency>
          <groupId>org.jboss.javaee</groupId>
          <artifactId>jboss-transaction-api</artifactId>
@@ -81,11 +76,7 @@
    </dependencies>
    <build>
       <plugins>
-         <!--
-        Generates XML schema for Infinispan configuration files
-        Run with mvn exec:java
-        For more details see:
-        http://mojo.codehaus.org/exec-maven-plugin/usage.html -->
+         
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
@@ -107,4 +98,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/core/src/main/java/org/infinispan/Version.java
===================================================================
--- tags/4.2.0.ALPHA4/core/src/main/java/org/infinispan/Version.java	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/core/src/main/java/org/infinispan/Version.java	2010-10-22 16:09:46 UTC (rev 2586)
@@ -31,10 +31,10 @@
  */
 @Immutable
 public class Version {
-   public static final String version = "5.0.0.SNAPSHOT";
+   public static final String version = "4.2.0.ALPHA4";
    public static final String codename = "Pagoa";
    public static final String projectName = "Infinispan";
-   static final byte[] version_id = {'0', '5', '0', '0', 'S'};
+   static final byte[] version_id = {'4', '2', '0', 'A', 'L', 'P', 'H', 'A', '4'};
    private static final int MAJOR_SHIFT = 11;
    private static final int MINOR_SHIFT = 6;
    private static final int MAJOR_MASK = 0x00f800;

Modified: tags/4.2.0.ALPHA4/demos/directory/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/demos/directory/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/demos/directory/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -45,4 +43,4 @@
       </dependency>
    </dependencies>
 
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/demos/ec2/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/demos/ec2/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/demos/ec2/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,11 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.infinispan</groupId>
 		<artifactId>infinispan-parent</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
+		<version>4.2.0.ALPHA4</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 
@@ -63,4 +63,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/demos/ec2-ui/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/demos/ec2-ui/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/demos/ec2-ui/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,11 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.infinispan</groupId>
 		<artifactId>infinispan-parent</artifactId>
-		<version>5.0.0-SNAPSHOT</version>
+		<version>4.2.0.ALPHA4</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 
@@ -53,4 +53,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/demos/gridfs-webdav/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/demos/gridfs-webdav/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/demos/gridfs-webdav/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,11 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -27,7 +27,7 @@
          <version>${version.webdav.servlet}</version>
       </dependency>
 
-      <!-- required by Webdav-Servlet -->
+      
       <dependency>
          <groupId>javax.servlet</groupId>
          <artifactId>servlet-api</artifactId>
@@ -38,4 +38,4 @@
 
 
    </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/demos/gui/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/demos/gui/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/demos/gui/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -53,4 +51,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/demos/lucene-directory-demo/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/demos/lucene-directory-demo/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/demos/lucene-directory-demo/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../../parent/pom.xml</relativePath>
    </parent>
 
@@ -32,7 +31,7 @@
    <build>
       <plugins>
       
-         <!-- Creates executable scripts -->
+         
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>appassembler-maven-plugin</artifactId>
@@ -49,7 +48,7 @@
             </configuration>
          </plugin>
          
-         <!-- Testing Configuration -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -75,4 +74,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/jopr-plugin/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/jopr-plugin/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/jopr-plugin/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,15 +1,12 @@
-<project
-      xmlns="http://maven.apache.org/POM/4.0.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-      >
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -53,14 +50,7 @@
          <scope>provided</scope>
       </dependency>
       
-<!--  
-      <dependency>
-         <groupId>org.rhq</groupId>
-         <artifactId>rhq-pluginGen</artifactId>
-         <version>${version.rhq.plugingen}</version>
-         <scope>provided</scope>
-      </dependency>
- -->  
+  
 
       <dependency>
          <groupId>mc4j</groupId>
@@ -69,7 +59,7 @@
          <scope>provided</scope>
       </dependency>
 
-      <!-- TODO: This is beyond horrible.  Surely we don't need these dependencies!! -->
+      
 
       <dependency>
          <groupId>org.hibernate</groupId>
@@ -92,7 +82,7 @@
          <scope>provided</scope>
       </dependency>
 
-      <!-- END unnenessary deps -->
+      
 
       <dependency>
          <groupId>${project.groupId}</groupId>
@@ -159,7 +149,7 @@
                      </goals>
                      <configuration>
                          <artifactItems>
-                             <!-- TODO include other needed external jars that should go into your jar file -->
+                             
                              <artifactItem>
                                  <groupId>org.infinispan</groupId>
                                  <artifactId>infinispan-core</artifactId>
@@ -194,24 +184,7 @@
          </executions>
          </plugin>
          
-         <!--
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.1</version>
-            <executions>
-               <execution>
-                  <phase>process-classes</phase>
-                  <goals>
-                     <goal>java</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <mainClass>org.infinispan.jopr.util.RhqPluginDescriptorGenerator</mainClass>
-            </configuration>
-         </plugin>
-         -->
+         
 
       </plugins>
    </build>
@@ -241,11 +214,10 @@
                         <phase>compile</phase>
                         <configuration>
                            <tasks>
-                              <mkdir dir="${rhq.deploymentDir}"/>
-                              <property name="deployment.file"
-                                        location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+                              <mkdir dir="${rhq.deploymentDir}" />
+                              <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
                               <echo>*** Updating ${deployment.file}...</echo>
-                              <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/>
+                              <jar basedir="${project.build.outputDirectory}" destfile="${deployment.file}" />
                            </tasks>
                         </configuration>
                         <goals>
@@ -258,18 +230,14 @@
                         <phase>package</phase>
                         <configuration>
                            <tasks>
-                              <property name="deployment.file"
-                                        location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+                              <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
                               <echo>*** Updating META-INF dir in ${deployment.file}...</echo>
-                              <unjar src="${project.build.directory}/${project.build.finalName}.jar"
-                                     dest="${project.build.outputDirectory}">
+                              <unjar dest="${project.build.outputDirectory}" src="${project.build.directory}/${project.build.finalName}.jar">
                                  <patternset>
-                                    <include name="META-INF/**"/>
+                                    <include name="META-INF/**" />
                                  </patternset>
                               </unjar>
-                              <jar destfile="${deployment.file}"
-                                   manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF"
-                                   update="true">
+                              <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
                               </jar>
                            </tasks>
                         </configuration>
@@ -283,10 +251,9 @@
                         <phase>clean</phase>
                         <configuration>
                            <tasks>
-                              <property name="deployment.file"
-                                        location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+                              <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
                               <echo>*** Deleting ${deployment.file}...</echo>
-                              <delete file="${deployment.file}"/>
+                              <delete file="${deployment.file}" />
                            </tasks>
                         </configuration>
                         <goals>
@@ -302,4 +269,4 @@
 
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- tags/4.2.0.ALPHA4/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/jopr-plugin/src/main/resources/META-INF/rhq-plugin.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -61,15 +61,32 @@
           >
 
 
+           <operation name="Invalidation.resetStatistics" displayName="[Invalidation] Reset statistics" description="Resets statistics gathered by this component">
+           </operation>
+           <operation name="Invalidation.setStatisticsEnabled" displayName="[Invalidation] Enable/disable statistics" description="Enable/disable statistics">
+              <parameters>
+                 <c:simple-property name="enabled" description="Whether statistics should be enabled or disabled (true/false)"/>
+              </parameters>
+           </operation>
            <operation name="Activation.resetStatistics" displayName="[Activation] Reset statistics" description="Resets statistics gathered by this component">
            </operation>
-           <operation name="RpcManager.resetStatistics" displayName="[RpcManager] Reset statistics" description="Resets statistics gathered by this component">
+           <operation name="DeadlockDetectingLockManager.resetStatistics" displayName="[DeadlockDetectingLockManager] Reset statistics" description="Resets statistics gathered by this component">
            </operation>
-           <operation name="RpcManager.setStatisticsEnabled" displayName="[RpcManager] Enable/disable statistics" description="Enable/disable statistics">
+           <operation name="Cache.start" displayName="[Cache] Starts cache." description="Starts the cache.">
+           </operation>
+           <operation name="Cache.stop" displayName="[Cache] Stops cache." description="Stops the cache.">
+           </operation>
+           <operation name="Transactions.resetStatistics" displayName="[Transactions] Reset Statistics" description="Resets statistics gathered by this component">
+           </operation>
+           <operation name="Transactions.setStatisticsEnabled" displayName="[Transactions] Enable/disable statistics" description="Enable/disable statistics">
               <parameters>
                  <c:simple-property name="enabled" description="Whether statistics should be enabled or disabled (true/false)"/>
               </parameters>
            </operation>
+           <operation name="CacheStore.resetStatistics" displayName="[CacheStore] Reset statistics" description="Resets statistics gathered by this component">
+           </operation>
+           <operation name="CacheLoader.resetStatistics" displayName="[CacheLoader] Reset Statistics" description="Resets statistics gathered by this component">
+           </operation>
            <operation name="DistributionManager.isAffectedByRehash" displayName="[DistributionManager] Could key be affected by rehash?" description="Determines whether a given key is affected by an ongoing rehash, if any.">
               <parameters>
                  <c:simple-property name="key" description="Key to check"/>
@@ -94,71 +111,54 @@
                  <c:simple-property name="operationResult" />
               </results>
            </operation>
-           <operation name="CacheStore.resetStatistics" displayName="[CacheStore] Reset statistics" description="Resets statistics gathered by this component">
+           <operation name="RpcManager.resetStatistics" displayName="[RpcManager] Reset statistics" description="Resets statistics gathered by this component">
            </operation>
-           <operation name="Transactions.resetStatistics" displayName="[Transactions] Reset Statistics" description="Resets statistics gathered by this component">
-           </operation>
-           <operation name="Transactions.setStatisticsEnabled" displayName="[Transactions] Enable/disable statistics" description="Enable/disable statistics">
+           <operation name="RpcManager.setStatisticsEnabled" displayName="[RpcManager] Enable/disable statistics" description="Enable/disable statistics">
               <parameters>
                  <c:simple-property name="enabled" description="Whether statistics should be enabled or disabled (true/false)"/>
               </parameters>
            </operation>
-           <operation name="CacheLoader.resetStatistics" displayName="[CacheLoader] Reset Statistics" description="Resets statistics gathered by this component">
+           <operation name="Statistics.resetStatistics" displayName="[Statistics] Reset Statistics (Statistics)" description="Resets statistics gathered by this component">
            </operation>
-           <operation name="Cache.start" displayName="[Cache] Starts cache." description="Starts the cache.">
-           </operation>
-           <operation name="Cache.stop" displayName="[Cache] Stops cache." description="Stops the cache.">
-           </operation>
-           <operation name="DeadlockDetectingLockManager.resetStatistics" displayName="[DeadlockDetectingLockManager] Reset statistics" description="Resets statistics gathered by this component">
-           </operation>
-           <operation name="Invalidation.resetStatistics" displayName="[Invalidation] Reset statistics" description="Resets statistics gathered by this component">
-           </operation>
-           <operation name="Invalidation.setStatisticsEnabled" displayName="[Invalidation] Enable/disable statistics" description="Enable/disable statistics">
-              <parameters>
-                 <c:simple-property name="enabled" description="Whether statistics should be enabled or disabled (true/false)"/>
-              </parameters>
-           </operation>
            <operation name="Passivation.resetStatistics" displayName="[Passivation] Reset statistics" description="Resets statistics gathered by this component">
            </operation>
-           <operation name="Statistics.resetStatistics" displayName="[Statistics] Reset Statistics (Statistics)" description="Resets statistics gathered by this component">
-           </operation>
 
+           <metric property="Invalidation.StatisticsEnabled" displayName="[Invalidation] Statistics enabled" displayType="detail" units="none" dataType="trait"
+                   description="Statistics enabled" />
+           <metric property="Invalidation.Invalidations" displayName="[Invalidation] Number of invalidations" displayType="detail" units="none" dataType="measurement"
+                   description="Number of invalidations" />
            <metric property="Activation.Activations" displayName="[Activation] Number of cache entries activated" displayType="detail" units="none" dataType="measurement"
                    description="Number of activation events" />
            <metric property="Activation.CacheLoaderLoads" displayName="[Activation] Number of cache store loads" displayType="detail" units="none" dataType="measurement"
                    description="Number of entries loaded from cache store" />
            <metric property="Activation.CacheLoaderMisses" displayName="[Activation] Number of cache store load misses" displayType="detail" units="none" dataType="measurement"
                    description="Number of entries that did not exist in cache store" />
-           <metric property="RpcManager.Members" displayName="[RpcManager] Cluster members" displayType="summary" units="none" dataType="trait"
-                   description="List of members in the cluster" />
-           <metric property="RpcManager.StatisticsEnabled" displayName="[RpcManager] Statistics enabled" displayType="detail" units="none" dataType="trait"
-                   description="Statistics enabled" />
-           <metric property="RpcManager.ReplicationCount" displayName="[RpcManager] Number of successful replications" displayType="summary" units="none" dataType="measurement"
-                   description="Number of successful replications" />
-           <metric property="RpcManager.ReplicationFailures" displayName="[RpcManager] Number of failed replications" displayType="summary" units="none" dataType="measurement"
-                   description="Number of failed replications" />
-           <metric property="RpcManager.NodeAddress" displayName="[RpcManager] Network address" displayType="summary" units="none" dataType="trait"
-                   description="The network address associated with this instance" />
-           <metric property="RpcManager.PhysicalAddresses" displayName="[RpcManager] Physical network addresses" displayType="summary" units="none" dataType="trait"
-                   description="The physical network addresses associated with this instance" />
-           <metric property="RpcManager.ClusterSize" displayName="[RpcManager] Cluster size" displayType="summary" units="none" dataType="measurement"
-                   description="Size of the cluster in number of nodes" />
-           <metric property="RpcManager.SuccessRatioFloatingPoint" displayName="[RpcManager] Successful replication ratio" displayType="summary" units="percentage" dataType="measurement"
-                   description="Successful replications as a ratio of total replications in numeric double format" />
-           <metric property="RpcManager.AverageReplicationTime" displayName="[RpcManager] Average time spent in the transport layer" displayType="summary" units="milliseconds" dataType="measurement"
-                   description="The average time spent in the transport layer, in milliseconds" />
+           <metric property="DeadlockDetectingLockManager.TotalNumberOfDetectedDeadlocks" displayName="[DeadlockDetectingLockManager] Number of total detected deadlocks" displayType="detail" units="none" dataType="measurement"
+                   description="Total number of local detected deadlocks" />
+           <metric property="DeadlockDetectingLockManager.DetectedRemoteDeadlocks" displayName="[DeadlockDetectingLockManager] Number of remote transaction that were roll backed due to deadlocks" displayType="detail" units="none" dataType="measurement"
+                   description="Number of remote transaction that were roll backed due to deadlocks" />
+           <metric property="DeadlockDetectingLockManager.DetectedLocalDeadlocks" displayName="[DeadlockDetectingLockManager] Number of local transaction that were roll backed due to deadlocks" displayType="detail" units="none" dataType="measurement"
+                   description="Number of local transaction that were roll backed due to deadlocks" />
+           <metric property="DeadlockDetectingLockManager.OverlapWithNotDeadlockAwareLockOwners" displayName="[DeadlockDetectingLockManager] Number of unsolvable deadlock situations" displayType="detail" units="none" dataType="measurement"
+                   description="Number of situations when we try to determine a deadlock and the other lock owner is NOT a transaction. In this scenario we cannot run the deadlock detection mechanism" />
+           <metric property="DeadlockDetectingLockManager.LocallyInterruptedTransactions" displayName="[DeadlockDetectingLockManager] Number of interrupted local transactions" displayType="detail" units="none" dataType="measurement"
+                   description="Number of locally originated transactions that were interrupted as a deadlock situation was detected" />
+           <metric property="DeadlockDetectingLockManager.ConcurrencyLevel" displayName="[DeadlockDetectingLockManager] Concurrency level" displayType="detail" units="none" dataType="trait"
+                   description="The concurrency level that the MVCC Lock Manager has been configured with." />
+           <metric property="DeadlockDetectingLockManager.NumberOfLocksHeld" displayName="[DeadlockDetectingLockManager] Number of locks held" displayType="detail" units="none" dataType="measurement"
+                   description="The number of exclusive locks that are held." />
+           <metric property="DeadlockDetectingLockManager.NumberOfLocksAvailable" displayName="[DeadlockDetectingLockManager] Number of locks available" displayType="detail" units="none" dataType="measurement"
+                   description="The number of exclusive locks that are available." />
            <metric property="LockManager.ConcurrencyLevel" displayName="[LockManager] Concurrency level" displayType="detail" units="none" dataType="trait"
                    description="The concurrency level that the MVCC Lock Manager has been configured with." />
            <metric property="LockManager.NumberOfLocksHeld" displayName="[LockManager] Number of locks held" displayType="detail" units="none" dataType="measurement"
                    description="The number of exclusive locks that are held." />
            <metric property="LockManager.NumberOfLocksAvailable" displayName="[LockManager] Number of locks available" displayType="detail" units="none" dataType="measurement"
                    description="The number of exclusive locks that are available." />
-           <metric property="DistributionManager.RehashInProgress" displayName="[DistributionManager] Is rehash in progress?" displayType="detail" units="none" dataType="trait"
-                   description="Checks whether the node is involved in a rehash." />
-           <metric property="DistributionManager.JoinComplete" displayName="[DistributionManager] Is join completed?" displayType="detail" units="none" dataType="trait"
-                   description="If true, the node has successfully joined the grid and is considered to hold state.  If false, the join process is still in progress." />
-           <metric property="CacheStore.CacheLoaderStores" displayName="[CacheStore] Number of cache stores" displayType="detail" units="none" dataType="measurement"
-                   description="number of cache loader stores" />
+           <metric property="Cache.CacheStatus" displayName="[Cache] Cache status" displayType="summary" units="none" dataType="trait"
+                   description="Returns the cache status" />
+           <metric property="Cache.CacheName" displayName="[Cache] Cache name" displayType="summary" units="none" dataType="trait"
+                   description="Returns the cache name" />
            <metric property="Transactions.StatisticsEnabled" displayName="[Transactions] Statistics enabled" displayType="detail" units="none" dataType="trait"
                    description="Statistics enabled" />
            <metric property="Transactions.Prepares" displayName="[Transactions] Prepares" displayType="summary" units="none" dataType="measurement"
@@ -167,36 +167,34 @@
                    description="Number of transaction commits performed since last reset" />
            <metric property="Transactions.Rollbacks" displayName="[Transactions] Rollbacks" displayType="summary" units="none" dataType="measurement"
                    description="Number of transaction rollbacks performed since last reset" />
+           <metric property="CacheStore.CacheLoaderStores" displayName="[CacheStore] Number of cache stores" displayType="detail" units="none" dataType="measurement"
+                   description="number of cache loader stores" />
            <metric property="CacheLoader.CacheLoaderLoads" displayName="[CacheLoader] Number of cache store loads" displayType="detail" units="none" dataType="measurement"
                    description="Number of entries loaded from cache store" />
            <metric property="CacheLoader.CacheLoaderMisses" displayName="[CacheLoader] Number of cache store load misses" displayType="detail" units="none" dataType="measurement"
                    description="Number of entries that did not exist in cache store" />
-           <metric property="Cache.CacheStatus" displayName="[Cache] Cache status" displayType="summary" units="none" dataType="trait"
-                   description="Returns the cache status" />
-           <metric property="Cache.CacheName" displayName="[Cache] Cache name" displayType="summary" units="none" dataType="trait"
-                   description="Returns the cache name" />
-           <metric property="DeadlockDetectingLockManager.TotalNumberOfDetectedDeadlocks" displayName="[DeadlockDetectingLockManager] Number of total detected deadlocks" displayType="detail" units="none" dataType="measurement"
-                   description="Total number of local detected deadlocks" />
-           <metric property="DeadlockDetectingLockManager.DetectedRemoteDeadlocks" displayName="[DeadlockDetectingLockManager] Number of remote transaction that were roll backed due to deadlocks" displayType="detail" units="none" dataType="measurement"
-                   description="Number of remote transaction that were roll backed due to deadlocks" />
-           <metric property="DeadlockDetectingLockManager.DetectedLocalDeadlocks" displayName="[DeadlockDetectingLockManager] Number of local transaction that were roll backed due to deadlocks" displayType="detail" units="none" dataType="measurement"
-                   description="Number of local transaction that were roll backed due to deadlocks" />
-           <metric property="DeadlockDetectingLockManager.OverlapWithNotDeadlockAwareLockOwners" displayName="[DeadlockDetectingLockManager] Number of unsolvable deadlock situations" displayType="detail" units="none" dataType="measurement"
-                   description="Number of situations when we try to determine a deadlock and the other lock owner is NOT a transaction. In this scenario we cannot run the deadlock detection mechanism" />
-           <metric property="DeadlockDetectingLockManager.LocallyInterruptedTransactions" displayName="[DeadlockDetectingLockManager] Number of interrupted local transactions" displayType="detail" units="none" dataType="measurement"
-                   description="Number of locally originated transactions that were interrupted as a deadlock situation was detected" />
-           <metric property="DeadlockDetectingLockManager.ConcurrencyLevel" displayName="[DeadlockDetectingLockManager] Concurrency level" displayType="detail" units="none" dataType="trait"
-                   description="The concurrency level that the MVCC Lock Manager has been configured with." />
-           <metric property="DeadlockDetectingLockManager.NumberOfLocksHeld" displayName="[DeadlockDetectingLockManager] Number of locks held" displayType="detail" units="none" dataType="measurement"
-                   description="The number of exclusive locks that are held." />
-           <metric property="DeadlockDetectingLockManager.NumberOfLocksAvailable" displayName="[DeadlockDetectingLockManager] Number of locks available" displayType="detail" units="none" dataType="measurement"
-                   description="The number of exclusive locks that are available." />
-           <metric property="Invalidation.StatisticsEnabled" displayName="[Invalidation] Statistics enabled" displayType="detail" units="none" dataType="trait"
+           <metric property="DistributionManager.RehashInProgress" displayName="[DistributionManager] Is rehash in progress?" displayType="detail" units="none" dataType="trait"
+                   description="Checks whether the node is involved in a rehash." />
+           <metric property="DistributionManager.JoinComplete" displayName="[DistributionManager] Is join completed?" displayType="detail" units="none" dataType="trait"
+                   description="If true, the node has successfully joined the grid and is considered to hold state.  If false, the join process is still in progress." />
+           <metric property="RpcManager.Members" displayName="[RpcManager] Cluster members" displayType="summary" units="none" dataType="trait"
+                   description="List of members in the cluster" />
+           <metric property="RpcManager.StatisticsEnabled" displayName="[RpcManager] Statistics enabled" displayType="detail" units="none" dataType="trait"
                    description="Statistics enabled" />
-           <metric property="Invalidation.Invalidations" displayName="[Invalidation] Number of invalidations" displayType="detail" units="none" dataType="measurement"
-                   description="Number of invalidations" />
-           <metric property="Passivation.Passivations" displayName="[Passivation] Number of cache passivations" displayType="detail" units="none" dataType="measurement"
-                   description="Number of passivation events" />
+           <metric property="RpcManager.ReplicationCount" displayName="[RpcManager] Number of successful replications" displayType="summary" units="none" dataType="measurement"
+                   description="Number of successful replications" />
+           <metric property="RpcManager.ReplicationFailures" displayName="[RpcManager] Number of failed replications" displayType="summary" units="none" dataType="measurement"
+                   description="Number of failed replications" />
+           <metric property="RpcManager.NodeAddress" displayName="[RpcManager] Network address" displayType="summary" units="none" dataType="trait"
+                   description="The network address associated with this instance" />
+           <metric property="RpcManager.PhysicalAddresses" displayName="[RpcManager] Physical network addresses" displayType="summary" units="none" dataType="trait"
+                   description="The physical network addresses associated with this instance" />
+           <metric property="RpcManager.ClusterSize" displayName="[RpcManager] Cluster size" displayType="summary" units="none" dataType="measurement"
+                   description="Size of the cluster in number of nodes" />
+           <metric property="RpcManager.SuccessRatioFloatingPoint" displayName="[RpcManager] Successful replication ratio" displayType="summary" units="percentage" dataType="measurement"
+                   description="Successful replications as a ratio of total replications in numeric double format" />
+           <metric property="RpcManager.AverageReplicationTime" displayName="[RpcManager] Average time spent in the transport layer" displayType="summary" units="milliseconds" dataType="measurement"
+                   description="The average time spent in the transport layer, in milliseconds" />
            <metric property="Statistics.Hits" displayName="[Statistics] Number of cache hits" displayType="summary" units="none" dataType="measurement"
                    description="Number of cache attribute hits" />
            <metric property="Statistics.Misses" displayName="[Statistics] Number of cache misses" displayType="summary" units="none" dataType="measurement"
@@ -223,6 +221,8 @@
                    description="Number of seconds since cache started" />
            <metric property="Statistics.TimeSinceReset" displayName="[Statistics] Seconds since cache statistics were reset" displayType="summary" units="seconds" dataType="measurement"
                    description="Number of seconds since the cache statistics were last reset" />
+           <metric property="Passivation.Passivations" displayName="[Passivation] Number of cache passivations" displayType="detail" units="none" dataType="measurement"
+                   description="Number of passivation events" />
 
 
        </service>

Modified: tags/4.2.0.ALPHA4/lucene-directory/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/lucene-directory/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/lucene-directory/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -86,4 +85,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/parent/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/parent/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/parent/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.infinispan</groupId>
    <artifactId>infinispan-parent</artifactId>
-   <version>5.0.0-SNAPSHOT</version>
+   <version>4.2.0.ALPHA4</version>
    <name>Infinispan Common Parent</name>
    <description>Infinispan common parent POM module</description>
    <url>http://www.infinispan.org</url>
@@ -74,7 +73,7 @@
       <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
       <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
 
-      <!-- Versions for dependencies -->
+      
       <version.apacheds.jdbm>1.5.4</version.apacheds.jdbm>
       <version.bdbje>4.0.92</version.bdbje>
       <version.c3p0>0.9.1.2</version.c3p0>
@@ -180,7 +179,7 @@
          <version>${version.log4j}</version>
       </dependency>
 
-      <!-- used to serialize non-serializable objects for a dummy marshaller -->
+      
       <dependency>
          <groupId>com.thoughtworks.xstream</groupId>
          <artifactId>xstream</artifactId>
@@ -191,7 +190,7 @@
 
    <build>
       <plugins>
-         <!-- enforce java 1.6 and maven 2.1.0 -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>
@@ -215,7 +214,7 @@
                </execution>
             </executions>
          </plugin>
-         <!-- by default, compile to JDK 1.6 compatibility (individual modules and/or user can override) -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
@@ -257,7 +256,7 @@
             </configuration>
          </plugin>
 
-         <!-- ensure parallel test execution -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -293,7 +292,7 @@
                </properties>
             </configuration>
          </plugin>
-         <!-- eclipse project file generation -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-eclipse-plugin</artifactId>
@@ -303,7 +302,7 @@
                <buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory>
             </configuration>
          </plugin>
-         <!-- IntelliJ project file generation -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-idea-plugin</artifactId>
@@ -312,7 +311,7 @@
                <downloadSources>true</downloadSources>
             </configuration>
          </plugin>
-         <!-- Make sure we generate src jars too -->
+         
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
@@ -374,7 +373,7 @@
             <artifactId>maven-surefire-report-plugin</artifactId>
             <version>2.4.3-JBOSS</version>
          </plugin>
-         <!-- Findbugs report -->
+         
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>findbugs-maven-plugin</artifactId>
@@ -473,8 +472,8 @@
          </properties>
       </profile>
       <profile>
-         <!-- Used to start the tests using the latest stable version of Lucene, use: -->
-         <!-- mvn clean test -P useLatestLuceneVersion,test-functional -->
+         
+         
          <id>useLatestLuceneVersion</id>
          <activation>
             <activeByDefault>false</activeByDefault>
@@ -484,7 +483,7 @@
          </properties>
       </profile>
       <profile>
-         <!-- define the Lucene version used in release package, and as reference target -->
+         
          <id>useReferenceLuceneVersion</id>
          <activation>
             <activeByDefault>true</activeByDefault>
@@ -494,4 +493,4 @@
          </properties>
       </profile>
    </profiles>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>parent/pom.xml</relativePath>
    </parent>
 
@@ -79,18 +77,18 @@
                               <link>http://java.sun.com/javase/6/docs/api/</link>
                               <link>http://java.sun.com/javaee/5/docs/api/</link>
                            </links>
-                           <footer><![CDATA[
+                           <footer>
                       Google Analytics
-<script type='text/javascript'>
+&lt;script type='text/javascript'&gt;
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
 try {
 var pageTracker = _gat._getTracker("UA-8601422-4");
 pageTracker._trackPageview();
-} catch(err) {}</script>
-                     ]]></footer>
+} catch(err) {}&lt;/script&gt;
+                     </footer>
                         </configuration>
                      </execution>
                   </executions>
@@ -135,8 +133,7 @@
          </build>
       </profile>
 
-      <!-- This profile is an scaled down version of the distribution profile which should only be used to speed up
-      testing of distribution zip files. It doesn't generate any documentation and only generates the -all.zip distribution -->
+      
       <profile>
          <id>minimal-distribution</id>
          <activation>
@@ -183,7 +180,7 @@
          </build>
       </profile>
 
-      <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+      
       <profile>
          <id>jmxdoc</id>
          <activation>
@@ -204,18 +201,18 @@
                         <artifactId>infinispan-tools</artifactId>
                         <version>${project.version}</version>
                      </docletArtifact>
-                     <footer><![CDATA[
-                <!-- Google Analytics -->
-<script type='text/javascript'>
+                     <footer>
+                &lt;!-- Google Analytics --&gt;
+&lt;script type='text/javascript'&gt;
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
 try {
 var pageTracker = _gat._getTracker("UA-8601422-4");
 pageTracker._trackPageview();
-} catch(err) {}</script>
-               ]]></footer>
+} catch(err) {}&lt;/script&gt;
+               </footer>
                   </configuration>
                   <executions>
                      <execution>
@@ -231,7 +228,7 @@
          </build>
       </profile>
 
-      <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+      
       <profile>
          <id>configdoc</id>
          <activation>
@@ -252,18 +249,18 @@
                         <artifactId>infinispan-tools</artifactId>
                         <version>${project.version}</version>
                      </docletArtifact>
-                     <footer><![CDATA[
-                <!-- Google Analytics -->
-<script type='text/javascript'>
+                     <footer>
+                &lt;!-- Google Analytics --&gt;
+&lt;script type='text/javascript'&gt;
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
 try {
 var pageTracker = _gat._getTracker("UA-8601422-4");
 pageTracker._trackPageview();
-} catch(err) {}</script>
-               ]]></footer>
+} catch(err) {}&lt;/script&gt;
+               </footer>
                   </configuration>
                   <executions>
                      <execution>
@@ -288,7 +285,7 @@
                         </goals>
                         <configuration>
                            <tasks>
-                              <copy file="tools/src/main/resources/stylesheet2.css" todir="target/site/apidocs"/>
+                              <copy file="tools/src/main/resources/stylesheet2.css" todir="target/site/apidocs" />
                            </tasks>
                         </configuration>
                      </execution>
@@ -299,4 +296,4 @@
       </profile>
 
    </profiles>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/query/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/query/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/query/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -52,4 +50,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/server/core/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/server/core/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/server/core/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -77,4 +75,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/server/hotrod/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/server/hotrod/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/server/hotrod/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -78,4 +76,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/server/memcached/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/server/memcached/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/server/memcached/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -91,4 +89,4 @@
       </repository>
    </repositories>
 
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/server/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/server/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/server/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
    
@@ -35,4 +33,4 @@
          <scope>test</scope>
       </dependency>
    </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/server/rest/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/server/rest/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/server/rest/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,11 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -84,7 +84,7 @@
          <scope>provided</scope>
       </dependency>
 
-      <!-- and now for unit and integration tests -->
+      
       <dependency>
          <groupId>org.mortbay.jetty</groupId>
          <artifactId>jetty-embedded</artifactId>
@@ -106,4 +106,4 @@
          <scope>test</scope>
       </dependency>
    </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/server/websocket/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/server/websocket/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/server/websocket/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,11 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-server-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
@@ -45,4 +45,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/tools/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/tools/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/tools/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -52,7 +50,7 @@
       </dependency>
    </dependencies>
 
-   <!-- needed for XSOM -->
+   
    <repositories>
       <repository>
          <id>download.java.net</id>
@@ -96,4 +94,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file

Modified: tags/4.2.0.ALPHA4/tree/pom.xml
===================================================================
--- tags/4.2.0.ALPHA4/tree/pom.xml	2010-10-22 16:08:23 UTC (rev 2585)
+++ tags/4.2.0.ALPHA4/tree/pom.xml	2010-10-22 16:09:46 UTC (rev 2586)
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-parent</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>4.2.0.ALPHA4</version>
       <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
@@ -45,4 +43,4 @@
          </plugin>
       </plugins>
    </build>
-</project>
+</project>
\ No newline at end of file



More information about the infinispan-commits mailing list