Attachment 873671 Details for Bug 1075719 – Patch for JDG 6.1.x

[patch] Patch for JDG 6.1.x

BZ1075719-jdg-6.1.x.patch (text/plain), 4.27 KB, created by Tristan Tarrant on 2014-03-12 17:09:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tristan Tarrant

Created: 2014-03-12 17:09:45 UTC

Size: 4.27 KB

patch

obsolete

>diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfigurationBuilder.java
>index c28514b..0b9c88d 100644
>--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfigurationBuilder.java
>+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcBinaryCacheStoreConfigurationBuilder.java
>@@ -18,7 +18,10 @@
>  */
> package org.infinispan.loaders.jdbc.configuration;
> 
>+import java.util.Properties;
>+
> import org.infinispan.configuration.cache.LoadersConfigurationBuilder;
>+import org.infinispan.config.parsing.XmlConfigHelper;
> import org.infinispan.util.TypedProperties;
> 
> public class JdbcBinaryCacheStoreConfigurationBuilder extends
>@@ -43,6 +46,14 @@ public BinaryTableManipulationConfigurationBuilder table() {
>    }
> 
>    @Override
>+   public JdbcBinaryCacheStoreConfigurationBuilder withProperties(Properties props) {
>+      XmlConfigHelper.setValues(this, props, false, false);
>+      XmlConfigHelper.setValues(table, props, false, false);
>+      this.properties = props;
>+      return this;
>+   }
>+
>+   @Override
>    public void validate() {
>       super.validate();
>    }
>diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationBuilder.java
>index 58c7c43..857ff5e 100644
>--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationBuilder.java
>+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcMixedCacheStoreConfigurationBuilder.java
>@@ -18,7 +18,10 @@
>  */
> package org.infinispan.loaders.jdbc.configuration;
> 
>+import java.util.Properties;
>+
> import org.infinispan.configuration.cache.LoadersConfigurationBuilder;
>+import org.infinispan.config.parsing.XmlConfigHelper;
> import org.infinispan.loaders.jdbc.DatabaseType;
> import org.infinispan.loaders.jdbc.TableManipulation;
> import org.infinispan.loaders.keymappers.DefaultTwoWayKey2StringMapper;
>@@ -100,6 +103,15 @@ public MixedTableManipulationConfigurationBuilder stringTable() {
>       return stringTable;
>    }
> 
>+   @Override
>+   public JdbcMixedCacheStoreConfigurationBuilder withProperties(Properties props) {
>+      XmlConfigHelper.setValues(this, props, false, false);
>+      XmlConfigHelper.setValues(binaryTable, props, false, false);
>+      XmlConfigHelper.setValues(stringTable, props, false, false);
>+      this.properties = props;
>+      return this;
>+   }
>+
>    /**
>     * The class name of a {@link Key2StringMapper} to use for mapping keys to strings suitable for
>     * storage in a database table. Defaults to {@link DefaultTwoWayKey2StringMapper}
>diff --git a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfigurationBuilder.java b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfigurationBuilder.java
>index 023e59b..f323310 100644
>--- a/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfigurationBuilder.java
>+++ b/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/configuration/JdbcStringBasedCacheStoreConfigurationBuilder.java
>@@ -18,8 +18,11 @@
>  */
> package org.infinispan.loaders.jdbc.configuration;
> 
>+import java.util.Properties;
>+
> import org.infinispan.configuration.Builder;
> import org.infinispan.configuration.cache.LoadersConfigurationBuilder;
>+import org.infinispan.config.parsing.XmlConfigHelper;
> import org.infinispan.loaders.keymappers.DefaultTwoWayKey2StringMapper;
> import org.infinispan.loaders.keymappers.Key2StringMapper;
> import org.infinispan.util.TypedProperties;
>@@ -72,6 +75,14 @@ public StringTableManipulationConfigurationBuilder table() {
>    }
> 
>    @Override
>+   public JdbcStringBasedCacheStoreConfigurationBuilder withProperties(Properties props) {
>+      XmlConfigHelper.setValues(this, props, false, false);
>+      XmlConfigHelper.setValues(table, props, false, false);
>+      this.properties = props;
>+      return this;
>+   }
>+
>+   @Override
>    public void validate() {
>    }
>

Actions: View | Diff

Attachments on bug 1075719: 873671