[infinispan-commits] Infinispan SVN: r616 - trunk/core/src/main/java/org/infinispan/config/parsing.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-07-24 04:58:55 -0400 (Fri, 24 Jul 2009)
New Revision: 616

Modified:
   trunk/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java
Log:
[ISPN-37] (EHCache migration script) - added UT for EHCache1.5

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java	2009-07-24 08:54:29 UTC (rev 615)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java	2009-07-24 08:58:55 UTC (rev 616)
@@ -55,7 +55,8 @@
 
    private static final String JBOSS_CACHE3X = "JBossCache3x";
    private static final String EHCACHE_CACHE16X = "Ehcache16x";
-   public static final String[] SUPPORTED_FORMATS = {JBOSS_CACHE3X, EHCACHE_CACHE16X};
+   private static final String EHCACHE_CACHE15X = "Ehcache15x";
+   public static final String[] SUPPORTED_FORMATS = {JBOSS_CACHE3X, EHCACHE_CACHE15X, EHCACHE_CACHE16X};
 
    public void parse(InputStream is, OutputStream os, String xsltFile) throws Exception {
       InputStream xsltInStream = new FileLookup().lookupFile(xsltFile);
@@ -136,8 +137,8 @@
 
       if (type.equals(JBOSS_CACHE3X)) {
          transformFromJbossCache3x(sourceName, destinationName);
-      } else if (type.equals(EHCACHE_CACHE16X)) {
-         transformFromEhcache16x(sourceName, destinationName);
+      } else if (type.equals(EHCACHE_CACHE15X) || type.equals(EHCACHE_CACHE16X)) {
+         transformFromEhcache15X_16x(sourceName, destinationName);
       }
 
       System.out.println("---");
@@ -185,7 +186,7 @@
       }
    }
 
-   private static void transformFromEhcache16x(String sourceName, String destinationName) throws Exception {
+   private static void transformFromEhcache15X_16x(String sourceName, String destinationName) throws Exception {
       File oldConfig = new File(sourceName);
       if (!oldConfig.exists()) {
          System.err.println("File specified as input ('" + sourceName + ") does not exist.");