[jbosscache-commits] JBoss Cache SVN: r7069 - in core/tags/3.0.0.CR4: src/main/java/org/jboss/cache and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: jason.greene at jboss.com
Date: 2008-11-03 18:57:21 -0500 (Mon, 03 Nov 2008)
New Revision: 7069

Modified:
   core/tags/3.0.0.CR4/pom.xml
   core/tags/3.0.0.CR4/src/main/java/org/jboss/cache/DefaultCacheFactory.java
   core/tags/3.0.0.CR4/src/main/java/org/jboss/cache/Version.java
Log:
Prep 3.0.0.CR4


Modified: core/tags/3.0.0.CR4/pom.xml
===================================================================
--- core/tags/3.0.0.CR4/pom.xml	2008-11-03 23:54:44 UTC (rev 7068)
+++ core/tags/3.0.0.CR4/pom.xml	2008-11-03 23:57:21 UTC (rev 7069)
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <properties>
-      <jbosscache-core-version>3.0.0.CR3</jbosscache-core-version>
+      <jbosscache-core-version>3.0.0.CR4</jbosscache-core-version>
       <!-- By default only run tests in the "unit" group -->
       <defaultTestGroup>unit</defaultTestGroup>
       <!-- By default only generate Javadocs when we install the module. -->

Modified: core/tags/3.0.0.CR4/src/main/java/org/jboss/cache/DefaultCacheFactory.java
===================================================================
--- core/tags/3.0.0.CR4/src/main/java/org/jboss/cache/DefaultCacheFactory.java	2008-11-03 23:54:44 UTC (rev 7068)
+++ core/tags/3.0.0.CR4/src/main/java/org/jboss/cache/DefaultCacheFactory.java	2008-11-03 23:57:21 UTC (rev 7069)
@@ -85,12 +85,10 @@
       {
          c = parser.parseFile(configFileName);
       }
-      catch (LegacyConfigurationException e)
+      catch (ConfigurationException e)
       {
          XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
          c = oldParser.parseFile(configFileName);
-         if (c != null)
-            log.warn("Detected legacy configuration file format when parsing [" + configFileName + "].  Migrating to the new (3.x) file format is recommended.  See FAQs for details.");
       }
       return createCache(c, start);
    }

Modified: core/tags/3.0.0.CR4/src/main/java/org/jboss/cache/Version.java
===================================================================
--- core/tags/3.0.0.CR4/src/main/java/org/jboss/cache/Version.java	2008-11-03 23:54:44 UTC (rev 7068)
+++ core/tags/3.0.0.CR4/src/main/java/org/jboss/cache/Version.java	2008-11-03 23:57:21 UTC (rev 7069)
@@ -32,10 +32,10 @@
 @Immutable
 public class Version
 {
-   public static final String version = "3.0.0.CR3";
+   public static final String version = "3.0.0.CR4";
    public static final String codename = "Naga";
    //public static final String cvs = "$Id: Version.java 4592 2007-10-10 16:44:36Z manik.surtani at jboss.com $";
-   static final byte[] version_id = {'0','3','0','0','C','R','3'};
+   static final byte[] version_id = {'0','3','0','0','C','R','4'};
 
    private static final int MAJOR_SHIFT = 11;
    private static final int MINOR_SHIFT = 6;