[infinispan-commits] Infinispan SVN: r2587 - in branches/4.2.x/core/src/main/java/org/infinispan: config/parsing and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-10-25 05:58:21 -0400 (Mon, 25 Oct 2010)
New Revision: 2587

Modified:
   branches/4.2.x/core/src/main/java/org/infinispan/Version.java
   branches/4.2.x/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java
Log:
ISPN-728 - Make NamespaceFilter.ISPN_NS not rely on hardcoded version - No more hardcoding.

Modified: branches/4.2.x/core/src/main/java/org/infinispan/Version.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/Version.java	2010-10-22 16:09:46 UTC (rev 2586)
+++ branches/4.2.x/core/src/main/java/org/infinispan/Version.java	2010-10-25 09:58:21 UTC (rev 2587)
@@ -31,7 +31,8 @@
  */
 @Immutable
 public class Version {
-   public static final String version = "4.2.0.SNAPSHOT";
+   public static final String major = "4.2";
+   public static final String version = major + ".0.SNAPSHOT";
    public static final String codename = "Ursus";
    public static final String projectName = "Infinispan";
    static final byte[] version_id = {'0', '4', '2', '0', 'S'};

Modified: branches/4.2.x/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java	2010-10-22 16:09:46 UTC (rev 2586)
+++ branches/4.2.x/core/src/main/java/org/infinispan/config/parsing/NamespaceFilter.java	2010-10-25 09:58:21 UTC (rev 2587)
@@ -1,5 +1,6 @@
 package org.infinispan.config.parsing;
 
+import org.infinispan.Version;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.XMLFilterImpl;
@@ -9,7 +10,7 @@
  */
 public class NamespaceFilter extends XMLFilterImpl {
 
-   public static final String ISPN_NS = "urn:infinispan:config:4.2";
+   public static final String ISPN_NS = "urn:infinispan:config:" + Version.major;
 
    //State variable
    private boolean addedNamespace = false;