diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 5906dc2e7e..8b8c51e750 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -138,6 +138,12 @@
true
test
+
+ ${project.groupId}
+ activemq-jaas
+ true
+ test
+
${project.groupId}
activemq-ra
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
index 478e4a9c01..47dee42702 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
@@ -80,8 +80,6 @@ public class ActiveMQComponent extends JmsComponent implements EndpointCompleter
.setBrokerURL(brokerURL);
}
- // set the connection factory with the provided broker url
- answer.setConnectionFactory(new ActiveMQConnectionFactory(brokerURL));
return answer;
}
diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/AMQ2240Test.java b/activemq-camel/src/test/java/org/apache/activemq/camel/AMQ2240Test.java
index 3405a12f9d..f2f799e47a 100644
--- a/activemq-camel/src/test/java/org/apache/activemq/camel/AMQ2240Test.java
+++ b/activemq-camel/src/test/java/org/apache/activemq/camel/AMQ2240Test.java
@@ -54,7 +54,9 @@ public class AMQ2240Test {
"jms.maxXXXXReconnectAttempts=1&jms.timeout=3000";
LOG.info("creating context with bad URI: " + vmUri);
- ActiveMQComponent.activeMQComponent(vmUri);
+ ActiveMQComponent amq = ActiveMQComponent.activeMQComponent(vmUri);
+
+ amq.getConfiguration().getConnectionFactory();
fail("Should have received an exception from the bad URI.");
} catch(Exception e) {
diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/ActiveMQComponentFactoryUserNamePasswordTest.java b/activemq-camel/src/test/java/org/apache/activemq/camel/ActiveMQComponentFactoryUserNamePasswordTest.java
new file mode 100644
index 0000000000..ffad7a5535
--- /dev/null
+++ b/activemq-camel/src/test/java/org/apache/activemq/camel/ActiveMQComponentFactoryUserNamePasswordTest.java
@@ -0,0 +1,49 @@
+/**
+ * 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.camel;
+
+import org.apache.activemq.camel.component.ActiveMQComponent;
+import org.apache.activemq.camel.component.ActiveMQConfiguration;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class ActiveMQComponentFactoryUserNamePasswordTest extends CamelSpringTestSupport {
+
+ @Override
+ protected AbstractApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/activemq/camel/ActiveMQComponentFactoryUserNamePassword.xml");
+ }
+
+ @Test
+ public void testActiveMQ() throws Exception {
+ ActiveMQComponent comp = context.getComponent("activemq", ActiveMQComponent.class);
+ assertNotNull(comp);
+
+ ActiveMQConfiguration config = (ActiveMQConfiguration) comp.getConfiguration();
+ assertNotNull(config);
+ assertEquals("admin2", config.getUserName());
+ assertEquals("secret2", config.getPassword());
+
+ getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
+
+ template.sendBody("activemq:queue:bar", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+}
diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/ActiveMQComponentUserNamePasswordTest.java b/activemq-camel/src/test/java/org/apache/activemq/camel/ActiveMQComponentUserNamePasswordTest.java
new file mode 100644
index 0000000000..3d8048616e
--- /dev/null
+++ b/activemq-camel/src/test/java/org/apache/activemq/camel/ActiveMQComponentUserNamePasswordTest.java
@@ -0,0 +1,49 @@
+/**
+ * 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.camel;
+
+import org.apache.activemq.camel.component.ActiveMQComponent;
+import org.apache.activemq.camel.component.ActiveMQConfiguration;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class ActiveMQComponentUserNamePasswordTest extends CamelSpringTestSupport {
+
+ @Override
+ protected AbstractApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/activemq/camel/ActiveMQComponentUserNamePassword.xml");
+ }
+
+ @Test
+ public void testActiveMQ() throws Exception {
+ ActiveMQComponent comp = context.getComponent("activemq", ActiveMQComponent.class);
+ assertNotNull(comp);
+
+ ActiveMQConfiguration config = (ActiveMQConfiguration) comp.getConfiguration();
+ assertNotNull(config);
+ assertEquals("admin", config.getUserName());
+ assertEquals("secret", config.getPassword());
+
+ getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
+
+ template.sendBody("activemq:queue:foo", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+}
diff --git a/activemq-camel/src/test/resources/org/apache/activemq/camel/ActiveMQComponentFactoryUserNamePassword.xml b/activemq-camel/src/test/resources/org/apache/activemq/camel/ActiveMQComponentFactoryUserNamePassword.xml
new file mode 100644
index 0000000000..061e8e3bfb
--- /dev/null
+++ b/activemq-camel/src/test/resources/org/apache/activemq/camel/ActiveMQComponentFactoryUserNamePassword.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/activemq-camel/src/test/resources/org/apache/activemq/camel/ActiveMQComponentUserNamePassword.xml b/activemq-camel/src/test/resources/org/apache/activemq/camel/ActiveMQComponentUserNamePassword.xml
new file mode 100644
index 0000000000..83d16fcae7
--- /dev/null
+++ b/activemq-camel/src/test/resources/org/apache/activemq/camel/ActiveMQComponentUserNamePassword.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+