From 2f5018222fb422f0d1fd195db165614fbf4fd0dd Mon Sep 17 00:00:00 2001
From: unknown <sayling@ayling.solers.local>
Date: Fri, 15 Mar 2013 10:12:08 -0400
Subject: [PATCH] ISPN-2928 XML Parser for JDBC Cachestore configuration sets
 wrong value for connection url

---
 .../jdbc/configuration/JdbcCacheStoreConfigurationParser52.java  | 2 +-
 .../loaders/jdbc/configuration/XmlFileParsingTest.java           | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser52.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser52.java
index 8ffc109..2c447b8 100644
--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser52.java
+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcCacheStoreConfigurationParser52.java
@@ -177,7 +177,7 @@ private void parseConnectionPoolAttributes(XMLExtendedStreamReader reader,
          Attribute attribute = Attribute.forName(reader.getAttributeLocalName(i));
          switch (attribute) {
          case CONNECTION_URL: {
-            builder.driverClass(value);
+            builder.connectionUrl(value);
             break;
          }
          case DRIVER_CLASS: {
diff --git a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/XmlFileParsingTest.java b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/XmlFileParsingTest.java
index a7f72c1..fa55141 100644
--- a/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/XmlFileParsingTest.java
+++ b/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/configuration/XmlFileParsingTest.java
@@ -22,19 +22,21 @@
  */
 package org.infinispan.loaders.jdbc.configuration;
 
-import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
+import static org.infinispan.test.TestingUtil.*;
+import static org.testng.AssertJUnit.*;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.infinispan.configuration.cache.CacheLoaderConfiguration;
+import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactory;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.test.AbstractInfinispanTest;
 import org.infinispan.test.TestingUtil;
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
-import static org.testng.AssertJUnit.*;
 
 @Test(groups = "unit", testName = "loaders.jdbc.configuration.XmlFileParsingTest")
 public class XmlFileParsingTest extends AbstractInfinispanTest {
@@ -46,6 +48,7 @@ public void cleanup() {
       TestingUtil.killCacheManagers(cacheManager);
    }
 
+   @Test
    public void testStringKeyedJdbcStore() throws Exception {
       String config = INFINISPAN_START_TAG +
             "   <default>\n" +
@@ -70,6 +73,8 @@ public void testStringKeyedJdbcStore() throws Exception {
       assertEquals("version", store.table().timestampColumnName());
       assertTrue(store.async().enabled());
       assertEquals("org.infinispan.loaders.jdbc.configuration.DummyKey2StringMapper", store.key2StringMapper());
+      store.connectionFactory();
+      
 
    }
 
-- 
1.8.1.msysgit.1