From 54e70f6c22c69bda1047e3462e161ce9a78506d5 Mon Sep 17 00:00:00 2001
From: Tomasz Adamski <tadamski@redhat.com>
Date: Tue, 15 Nov 2016 12:57:15 +0100
Subject: [PATCH] [WFLY-5403] Update discovery client to 1.0.0.Beta3

---
 .../remote/DescriptorBasedEJBClientContextService.java   | 2 +-
 .../org/jboss/as/ejb3/remote/LocalTransportProvider.java | 8 --------
 .../jboss/as/ejb3/subsystem/EJB3Subsystem50Parser.java   | 9 +--------
 .../base/org/wildfly/client/discovery/main/module.xml    | 1 +
 pom.xml                                                  | 2 +-
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/remote/DescriptorBasedEJBClientContextService.java b/ejb3/src/main/java/org/jboss/as/ejb3/remote/DescriptorBasedEJBClientContextService.java
index b1473a3bebf4..92f08271972d 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/remote/DescriptorBasedEJBClientContextService.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/remote/DescriptorBasedEJBClientContextService.java
@@ -67,7 +67,7 @@ public synchronized void start(final StartContext startContext) throws StartExce
         }
         if(!profileService.getServiceUrls().isEmpty()) {
             DiscoveryProvider staticDiscoveryProvider = new StaticDiscoveryProvider(profileService.getServiceUrls());
-            contextBuilder.addDiscoveryProvider(staticDiscoveryProvider);
+            //TODO Elytron - quickfix after discovery update required
         }
         this.ejbClientContext = contextBuilder.build();
     }
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalTransportProvider.java b/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalTransportProvider.java
index 4777c38078b7..20967cbaad1e 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalTransportProvider.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/remote/LocalTransportProvider.java
@@ -33,7 +33,6 @@
 import org.jboss.msc.service.StartException;
 import org.jboss.msc.service.StopContext;
 import org.jboss.msc.value.InjectedValue;
-import org.wildfly.discovery.spi.DiscoveryProvider;
 
 /**
  *  @author <a href=mailto:tadamski@redhat.com>Tomasz Adamski</a>
@@ -88,13 +87,6 @@ public EJBReceiver getReceiver(final String uriScheme) throws IllegalArgumentExc
         return receiver;
     }
 
-    @Override
-    public DiscoveryProvider getDiscoveryProvider() {
-        return receiver;
-    }
-
-
-
     @Override
     public LocalTransportProvider getValue() throws IllegalStateException, IllegalArgumentException {
         return this;
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Subsystem50Parser.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Subsystem50Parser.java
index e7902d31199d..bcc169ebf468 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Subsystem50Parser.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Subsystem50Parser.java
@@ -60,13 +60,6 @@
 import org.wildfly.client.config.ConfigXMLParseException;
 
 import org.wildfly.discovery.ServiceURL;
-import org.wildfly.discovery.impl.StaticDiscoveryProvider;
-
-
-
-
-
-
 
 import java.util.EnumSet;
 
@@ -258,7 +251,7 @@ protected void parseProfile(final XMLExtendedStreamReader reader, List<ModelNode
         }
 
         if (!staticURLs.isEmpty()) {
-            builder.addDiscoveryProvider(new StaticDiscoveryProvider(staticURLs));
+            //TODO Elytron - quickfix after discovery update required
         }
     }
 
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/client/discovery/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/client/discovery/main/module.xml
index 0c7367233bc7..88720c9d631f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/client/discovery/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/client/discovery/main/module.xml
@@ -28,5 +28,6 @@
 
     <dependencies>
         <module name="org.wildfly.common"/>
+        <module name="org.wildfly.client.config"/>
     </dependencies>
 </module>
diff --git a/pom.xml b/pom.xml
index 8ab01eb14ba5..f3d13b911d19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,7 +223,7 @@
         <version.org.wildfly.security.elytron-subsystem>1.0.0.Alpha15</version.org.wildfly.security.elytron-subsystem>
         <version.org.wildfly.client-config>1.0.0.Beta1</version.org.wildfly.client-config>
         <version.org.wildfly.common>1.2.0.Beta1</version.org.wildfly.common>
-        <version.org.wildfly.discovery-client>1.0.0.Beta1</version.org.wildfly.discovery-client>
+        <version.org.wildfly.discovery-client>1.0.0.Beta3</version.org.wildfly.discovery-client>
         <version.org.yaml.snakeyaml>1.15</version.org.yaml.snakeyaml>
         <version.sun.jaxb>2.2.11.jbossorg-1</version.sun.jaxb>
         <version.sun.saaj-impl>1.3.16-jbossorg-1</version.sun.saaj-impl>