Attachment 681740 Details for Bug 900707 – 0001-JBPAPP-9504-use-the-PropertiesValueResolver-of-jboss.patch

0001-JBPAPP-9504-use-the-PropertiesValueResolver-of-jboss.patch

0001-JBPAPP-9504-use-the-PropertiesValueResolver-of-jboss.patch (text/x-patch), 4.32 KB, created by Chao Wang on 2012-08-13 05:45:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chao Wang

Created: 2012-08-13 05:45:51 UTC

Size: 4.32 KB

patch

obsolete

>From 041179c958a44843c2dc550dbda8608ecf29b493 Mon Sep 17 00:00:00 2001
>From: ChaoWang <chaowan@redhat.com>
>Date: Mon, 13 Aug 2012 13:38:01 +0800
>Subject: [PATCH] JBPAPP-9504, use the PropertiesValueResolver of
> jboss.common.beans to do the property substitution in AS.
>
>
>Signed-off-by: ChaoWang <chaowan@redhat.com>
>---
> .../jboss/as/clustering/jgroups/main/module.xml    |    1 +
> clustering/jgroups/pom.xml                         |    4 +++
> .../as/clustering/jgroups/JChannelFactory.java     |   21 ++++++++++++++++++-
> 3 files changed, 24 insertions(+), 2 deletions(-)
>
>diff --git a/build/src/main/resources/modules/org/jboss/as/clustering/jgroups/main/module.xml b/build/src/main/resources/modules/org/jboss/as/clustering/jgroups/main/module.xml
>index 095ad65..9e7734c 100644
>--- a/build/src/main/resources/modules/org/jboss/as/clustering/jgroups/main/module.xml
>+++ b/build/src/main/resources/modules/org/jboss/as/clustering/jgroups/main/module.xml
>@@ -45,5 +45,6 @@
>         <module name="org.jboss.staxmapper"/>
>         <module name="org.jboss.threads"/>
>         <module name="org.jgroups"/>
>+        <module name="org.jboss.common-beans"/>
>     </dependencies>
> </module>
>diff --git a/clustering/jgroups/pom.xml b/clustering/jgroups/pom.xml
>index c05e9d3..4295c6f 100644
>--- a/clustering/jgroups/pom.xml
>+++ b/clustering/jgroups/pom.xml
>@@ -63,6 +63,10 @@
>             <artifactId>jgroups</artifactId>
>         </dependency>
>         <dependency>
>+            <groupId>org.jboss.common</groupId>
>+            <artifactId>jboss-common-beans</artifactId>
>+        </dependency>
>+        <dependency>
>             <groupId>org.jboss.as</groupId>
>             <artifactId>jboss-as-clustering-common</artifactId>
>             <version>${project.version}</version>
>diff --git a/clustering/jgroups/src/main/java/org/jboss/as/clustering/jgroups/JChannelFactory.java b/clustering/jgroups/src/main/java/org/jboss/as/clustering/jgroups/JChannelFactory.java
>index 47366b2..848de08 100644
>--- a/clustering/jgroups/src/main/java/org/jboss/as/clustering/jgroups/JChannelFactory.java
>+++ b/clustering/jgroups/src/main/java/org/jboss/as/clustering/jgroups/JChannelFactory.java
>@@ -25,8 +25,10 @@ import java.net.InetSocketAddress;
> import java.util.ArrayList;
> import java.util.Collections;
> import java.util.HashMap;
>+import java.util.Iterator;
> import java.util.List;
> import java.util.Map;
>+import java.util.Set;
> import java.util.WeakHashMap;
> import java.util.concurrent.ExecutorService;
> import java.util.concurrent.ScheduledExecutorService;
>@@ -38,6 +40,7 @@ import org.jboss.as.clustering.concurrent.ManagedExecutorService;
> import org.jboss.as.clustering.concurrent.ManagedScheduledExecutorService;
> import org.jboss.as.network.SocketBinding;
> import org.jboss.as.server.ServerEnvironment;
>+import org.jboss.common.beans.property.PropertiesValueResolver;
> import org.jgroups.Channel;
> import org.jgroups.ChannelListener;
> import org.jgroups.Global;
>@@ -234,8 +237,22 @@ public class JChannelFactory implements ChannelFactory, ChannelListener, Protoco
>     private org.jgroups.conf.ProtocolConfiguration createProtocol(final ProtocolConfiguration protocolConfig) {
>         String protocol = protocolConfig.getName();
>         final Map<String, String> properties = new HashMap<String, String>(this.configuration.getDefaults().getProperties(protocol));
>-        properties.putAll(protocolConfig.getProperties());
>-        return new org.jgroups.conf.ProtocolConfiguration(protocol, properties);
>+        Map<String, String> propertiesMap = protocolConfig.getProperties();
>+        Map<String, String> propertiesSubstitutionMap = new HashMap<String,String>();
>+        Set<String> keys  = propertiesMap.keySet();
>+        for(Iterator<String> it = keys.iterator();it.hasNext();){
>+            String key = (String)it.next();
>+            String value = propertiesMap.get(key);
>+            value = PropertiesValueResolver.replaceProperties(value);
>+            propertiesSubstitutionMap.put(key, value);
>+            }
>+        properties.putAll(propertiesSubstitutionMap);
>+        return new org.jgroups.conf.ProtocolConfiguration(protocol, properties) {
>+            @Override
>+            public Map<String, String> getOriginalProperties() {
>+                return properties;
>+                }
>+            };
>     }
> 
>     private void setValue(Protocol protocol, String property, Object value) {
>-- 
>1.7.7.6
>

Actions: View

Attachments on bug 900707: 681738 | 681739 | 681740