From 1d63c79c938cc55280799b8433e49e3540b8b840 Mon Sep 17 00:00:00 2001
From: Farah Juma <fjuma@redhat.com>
Date: Tue, 20 Dec 2016 16:40:24 -0500
Subject: [PATCH] [EJBCLIENT-179] Re-introduce an
 org.jboss.ejb.client.naming.ejb.ejbURLContextFactory class for compatibility
 purposes

---
 .../java/org/jboss/ejb/_private/Logs.java     |  4 ++
 .../naming/ejb/ejbURLContextFactory.java      | 50 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 src/main/java/org/jboss/ejb/client/naming/ejb/ejbURLContextFactory.java

diff --git a/src/main/java/org/jboss/ejb/_private/Logs.java b/src/main/java/org/jboss/ejb/_private/Logs.java
index ac6fd317b..53f68e975 100644
--- a/src/main/java/org/jboss/ejb/_private/Logs.java
+++ b/src/main/java/org/jboss/ejb/_private/Logs.java
@@ -255,6 +255,10 @@ public interface Logs extends BasicLogger {
     @Message(id = 63, value = "EJB proxy is already stateful")
     IllegalArgumentException ejbIsAlreadyStateful();
 
+    @LogMessage(level = Logger.Level.INFO)
+    @Message(id = 64, value = "org.jboss.ejb.client.naming.ejb.ejbURLContextFactory is deprecated; new applications should use org.wildfly.naming.client.WildFlyInitialContextFactory instead")
+    void ejbURLContextFactoryDeprecated();
+
     // Proxy API errors
 
     @Message(id = 100, value = "Object '%s' is not a valid proxy object")
diff --git a/src/main/java/org/jboss/ejb/client/naming/ejb/ejbURLContextFactory.java b/src/main/java/org/jboss/ejb/client/naming/ejb/ejbURLContextFactory.java
new file mode 100644
index 000000000..c85821e46
--- /dev/null
+++ b/src/main/java/org/jboss/ejb/client/naming/ejb/ejbURLContextFactory.java
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2016, Red Hat Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb.client.naming.ejb;
+
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.spi.ObjectFactory;
+import java.util.Hashtable;
+
+import org.jboss.ejb._private.Logs;
+import org.wildfly.naming.client.WildFlyInitialContextFactory;
+
+/**
+ * Compatibility class.
+ *
+ * @deprecated Use {@link WildFlyInitialContextFactory} instead.
+ * @author <a href="mailto:fjuma@redhat.com">Farah Juma</a>
+ */
+public class ejbURLContextFactory implements ObjectFactory {
+    static {
+        Logs.MAIN.ejbURLContextFactoryDeprecated();
+    }
+
+    private final WildFlyInitialContextFactory delegate = new WildFlyInitialContextFactory();
+
+    public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable<?, ?> environment) throws Exception {
+        return delegate.getInitialContext(environment);
+    }
+}
+