From 61b1df34e059f982a32e2b68aa64524d2b3f8f94 Mon Sep 17 00:00:00 2001
From: Christian Schneider <chris@die-schneider.net>
Date: Fri, 16 Dec 2016 11:09:36 +0100
Subject: [PATCH 1/2] [AMQ-6542] Use name instead of configurationPid to make
 relation to config more obvious

---
 .../org/apache/activemq/osgi/cf/ConnectionFactoryProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activemq-cf/src/main/java/org/apache/activemq/osgi/cf/ConnectionFactoryProvider.java b/activemq-cf/src/main/java/org/apache/activemq/osgi/cf/ConnectionFactoryProvider.java
index 67f64fb739d..ee284987bcb 100644
--- a/activemq-cf/src/main/java/org/apache/activemq/osgi/cf/ConnectionFactoryProvider.java
+++ b/activemq-cf/src/main/java/org/apache/activemq/osgi/cf/ConnectionFactoryProvider.java
@@ -33,7 +33,7 @@
 
 @Component //
 ( //
-    configurationPid = "org.apache.activemq", //
+    name = "org.apache.activemq", //
     immediate = true, //
     configurationPolicy = ConfigurationPolicy.REQUIRE //
 )

From 5c034b4b65422309b886ea174db9ad4a63ed4b23 Mon Sep 17 00:00:00 2001
From: Christian Schneider <chris@die-schneider.net>
Date: Fri, 16 Dec 2016 11:10:17 +0100
Subject: [PATCH 2/2] [AMQ-6542] Test creation of ConnectionFactory from config

---
 .../itest/ActiveMQClientFactoryTest.java      | 63 +++++++++++++++++++
 .../karaf/itest/org.apache.activemq-local.cfg |  3 +
 2 files changed, 66 insertions(+)
 create mode 100644 activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientFactoryTest.java
 create mode 100644 activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq-local.cfg

diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientFactoryTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientFactoryTest.java
new file mode 100644
index 00000000000..8b73fcfa4ae
--- /dev/null
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientFactoryTest.java
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.karaf.itest;
+
+import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile;
+
+import java.io.File;
+import java.util.concurrent.Callable;
+
+import javax.inject.Inject;
+import javax.jms.ConnectionFactory;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class ActiveMQClientFactoryTest extends AbstractJmsFeatureTest {
+    @Inject
+    ConnectionFactory connectionFactory;
+
+    /**
+     * Start karaf with activemq broker and create ConnectionFactory from config
+     */
+    @Configuration
+    public Option[] configure() {
+        return new Option[] //
+        {
+         composite(super.configure("activemq", "activemq-broker", "activemq-cf")),
+         replaceConfigurationFile("etc/org.apache.activemq.cfg", 
+                                  new File(basedir + "/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq-local.cfg"))
+        };
+    }
+
+    @Test
+    public void testConnection() throws Throwable {
+        withinReason(new Callable<Boolean>() {
+            
+            @Override
+            public Boolean call() throws Exception {
+                connectionFactory.createConnection().close();
+                return true;
+            }
+        });
+    }
+}
diff --git a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq-local.cfg b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq-local.cfg
new file mode 100644
index 00000000000..96e088b8d75
--- /dev/null
+++ b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq-local.cfg
@@ -0,0 +1,3 @@
+url=tcp://localhost:61616
+userName=karaf
+password=karaf