You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/02/29 09:32:45 UTC
[01/13] camel git commit: Updated Javadoc.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x c7e57023e -> 975e88084
Updated Javadoc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e8a0134
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e8a0134
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e8a0134
Branch: refs/heads/camel-2.16.x
Commit: 2e8a0134f65fc31918655d744051cf9b62a8c6ef
Parents: c7e5702
Author: Henryk Konsek <he...@gmail.com>
Authored: Fri Oct 9 10:11:13 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:26:09 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/amqp/AMQPEndpoint.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2e8a0134/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
index ce630f6..4fb5c9e 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
@@ -22,6 +22,10 @@ import org.apache.camel.spi.UriEndpoint;
@UriEndpoint(scheme = "amqp", extendsScheme = "jms", title = "AMQP",
syntax = "amqp:destinationType:destinationName", consumerClass = JmsConsumer.class, label = "messaging")
+/**
+ * AMQP endpoint. This class extends JmsEndpoint because it uses Apache Qpid JMS-compatible client for
+ * performing the AMQP connectivity.
+ */
public class AMQPEndpoint extends JmsEndpoint {
}
[10/13] camel git commit: [camel-amqp] Added extra tests.
Posted by ac...@apache.org.
[camel-amqp] Added extra tests.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/160f02d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/160f02d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/160f02d3
Branch: refs/heads/camel-2.16.x
Commit: 160f02d315b7792c3ec4afd86fa1029594a8c254
Parents: 940077a
Author: Henryk Konsek <he...@gmail.com>
Authored: Thu Dec 3 12:57:57 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:29:28 2016 +0100
----------------------------------------------------------------------
.../camel/component/amqp/AMQPRouteTest.java | 22 ++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/160f02d3/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index ce89bc6..3ed0935 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -20,6 +20,7 @@ import org.apache.activemq.broker.BrokerService;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jms.JmsConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -75,6 +76,23 @@ public class AMQPRouteTest extends CamelTestSupport {
resultEndpoint.assertIsSatisfied();
}
+ @Test
+ public void testPrefixWildcard() throws Exception {
+ resultEndpoint.expectedMessageCount(1);
+ template.sendBody("amqp:wildcard.foo.bar", expectedBody);
+ resultEndpoint.assertIsSatisfied();
+ }
+
+ @Test
+ public void testIncludeDestination() throws Exception {
+ resultEndpoint.expectedMessageCount(1);
+ resultEndpoint.message(0).header("JMSDestination").isEqualTo("ping");
+ template.sendBody("amqp:queue:ping", expectedBody);
+ resultEndpoint.assertIsSatisfied();
+ }
+
+ // Routes fixtures
+
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
camelContext.addComponent("amqp", amqpComponent("amqp://localhost:" + amqpPort));
@@ -98,6 +116,10 @@ public class AMQPRouteTest extends CamelTestSupport {
from("amqp:topic:ping")
.to("log:routing")
.to("mock:result");
+
+ from("amqp:queue:wildcard.>")
+ .to("log:routing")
+ .to("mock:result");
}
};
}
[08/13] camel git commit: [camel-amqp] Added extra factory methods.
Posted by ac...@apache.org.
[camel-amqp] Added extra factory methods.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a7f18460
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a7f18460
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a7f18460
Branch: refs/heads/camel-2.16.x
Commit: a7f184603c16081b23b4edbc4e329f41582eb88a
Parents: dc712e4
Author: Henryk Konsek <he...@gmail.com>
Authored: Thu Dec 3 12:15:50 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:28:54 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/amqp/AMQPComponent.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a7f18460/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index 3100e20..8dcf7e6 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -29,6 +29,8 @@ import org.apache.qpid.jms.JmsConnectionFactory;
*/
public class AMQPComponent extends JmsComponent {
+ // Constructors
+
public AMQPComponent() {
super(AMQPEndpoint.class);
}
@@ -45,6 +47,8 @@ public class AMQPComponent extends JmsComponent {
setConnectionFactory(connectionFactory);
}
+ // Factory methods
+
/**
* Use {@code amqpComponent(String uri)} instead.
*/
@@ -61,4 +65,10 @@ public class AMQPComponent extends JmsComponent {
return new AMQPComponent(connectionFactory);
}
+ public static AMQPComponent amqpComponent(String uri, String username, String password) {
+ JmsConnectionFactory connectionFactory = new JmsConnectionFactory(username, password, uri);
+ connectionFactory.setTopicPrefix("topic://");
+ return new AMQPComponent(connectionFactory);
+ }
+
}
[07/13] camel git commit: Improved AMQP test coverage.
Posted by ac...@apache.org.
Improved AMQP test coverage.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc712e46
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc712e46
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc712e46
Branch: refs/heads/camel-2.16.x
Commit: dc712e461a85cb3490a5e10d7876484ed123cb65
Parents: 57f3ce7
Author: Henryk Konsek <he...@gmail.com>
Authored: Tue Dec 1 17:31:18 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:28:35 2016 +0100
----------------------------------------------------------------------
.../camel/component/amqp/AMQPComponent.java | 2 -
.../camel/component/amqp/AMQPRouteTest.java | 48 ++++++++++++--------
2 files changed, 28 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dc712e46/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index e326cf44..3100e20 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -17,11 +17,9 @@
package org.apache.camel.component.amqp;
import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import javax.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
-import org.apache.camel.Component;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.jms.JmsConfiguration;
import org.apache.qpid.jms.JmsConnectionFactory;
http://git-wip-us.apache.org/repos/asf/camel/blob/dc712e46/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index 73ac9e0..d5d37db 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -18,22 +18,38 @@ package org.apache.camel.component.amqp;
import org.apache.activemq.broker.BrokerService;
import org.apache.camel.CamelContext;
+import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent;
public class AMQPRouteTest extends CamelTestSupport {
- protected MockEndpoint resultEndpoint;
+ static BrokerService broker;
- protected BrokerService broker;
+ @EndpointInject(uri = "mock:result")
+ MockEndpoint resultEndpoint;
String expectedBody = "Hello there!";
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ broker = new BrokerService();
+ broker.setPersistent(false);
+ broker.addConnector("amqp://0.0.0.0:5672");
+ broker.start();
+ }
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ broker.stop();
+ }
+
@Test
public void testJmsQueue() throws Exception {
resultEndpoint.expectedMessageCount(1);
@@ -43,6 +59,12 @@ public class AMQPRouteTest extends CamelTestSupport {
}
@Test
+ public void testRequestReply() {
+ String response = template.requestBody("amqp1-0:queue:inOut", expectedBody, String.class);
+ assertEquals("response", response);
+ }
+
+ @Test
public void testJmsTopic() throws Exception {
resultEndpoint.expectedMessageCount(2);
resultEndpoint.message(0).header("cheese").isEqualTo(123);
@@ -50,23 +72,6 @@ public class AMQPRouteTest extends CamelTestSupport {
resultEndpoint.assertIsSatisfied();
}
- @Before
- public void setUp() throws Exception {
- broker = new BrokerService();
- broker.setPersistent(false);
- broker.addConnector("amqp://0.0.0.0:5672");
- broker.start();
-
- super.setUp();
- resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
- }
-
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- broker.stop();
- }
-
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
camelContext.addComponent("amqp1-0", amqpComponent("amqp://localhost:5672"));
@@ -80,6 +85,9 @@ public class AMQPRouteTest extends CamelTestSupport {
.to("log:routing")
.to("mock:result");
+ from("amqp1-0:queue:inOut")
+ .setBody().constant("response");
+
from("amqp1-0:topic:ping")
.to("log:routing")
.to("mock:result");
[02/13] camel git commit: [CAMEL-9381] Removed AMQP 0.9 tests.
Posted by ac...@apache.org.
[CAMEL-9381] Removed AMQP 0.9 tests.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/84a43326
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/84a43326
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/84a43326
Branch: refs/heads/camel-2.16.x
Commit: 84a43326393a715e64fda41653eb71a3b5cf17d1
Parents: 2e8a013
Author: Henryk Konsek <he...@gmail.com>
Authored: Tue Dec 1 15:24:05 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:26:27 2016 +0100
----------------------------------------------------------------------
.../apache/camel/component/amqp/AMQPRouteTest.java | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/84a43326/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index b388698..1b63ad8 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -27,9 +27,6 @@ import org.junit.Test;
import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent;
-/**
- * @version
- */
public class AMQPRouteTest extends CamelTestSupport {
protected MockEndpoint resultEndpoint;
protected Broker broker;
@@ -38,11 +35,6 @@ public class AMQPRouteTest extends CamelTestSupport {
public void testJmsRouteWithTextMessage() throws Exception {
String expectedBody = "Hello there!";
- resultEndpoint.expectedMessageCount(1);
- resultEndpoint.message(0).header("cheese").isEqualTo(123);
- template.sendBodyAndHeader("amqp0-9:queue:ping", expectedBody, "cheese", 123);
- resultEndpoint.assertIsSatisfied();
-
resultEndpoint.reset();
resultEndpoint.expectedMessageCount(1);
resultEndpoint.message(0).header("cheese").isEqualTo(123);
@@ -73,7 +65,6 @@ public class AMQPRouteTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("amqp0-9", amqpComponent("amqp://guest:guest@/test?brokerlist='tcp://localhost:5672'", true));
camelContext.addComponent("amqp1-0", amqpComponent("amqp://guest:guest@localhost:5672?remote-host=test", false));
return camelContext;
}
@@ -81,14 +72,11 @@ public class AMQPRouteTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("amqp0-9:queue:ping")
- .to("log:routing")
- .to("mock:result");
-
from("amqp1-0:queue:ping")
.to("log:routing")
.to("mock:result");
}
};
}
+
}
[13/13] camel git commit: [CAMEL-9388] Provide properties-based AMQP
connection discovery.
Posted by ac...@apache.org.
[CAMEL-9388] Provide properties-based AMQP connection discovery.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/975e8808
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/975e8808
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/975e8808
Branch: refs/heads/camel-2.16.x
Commit: 975e8808410a7e2c2bdd8f0ab5982ea88fae0b28
Parents: 4d169c9
Author: Henryk Konsek <he...@gmail.com>
Authored: Thu Dec 3 16:04:36 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:30:14 2016 +0100
----------------------------------------------------------------------
.../component/amqp/AMQPConnectionDetails.java | 38 ++++++++++++++++++++
.../camel/component/amqp/AMQPRouteTest.java | 8 ++++-
2 files changed, 45 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/975e8808/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java
index 545bd27..fa06b5b 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java
@@ -16,8 +16,19 @@
*/
package org.apache.camel.component.amqp;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.properties.PropertiesComponent;
+
public class AMQPConnectionDetails {
+ public static final String AMQP_HOST = "AMQP_SERVICE_HOST";
+
+ public static final String AMQP_PORT = "AMQP_SERVICE_PORT";
+
+ public static final String AMQP_USERNAME = "AMQP_SERVICE_USERNAME";
+
+ public static final String AMQP_PASSWORD = "AMQP_SERVICE_PASSWORD";
+
private final String uri;
private final String username;
@@ -34,6 +45,21 @@ public class AMQPConnectionDetails {
this(uri, null, null);
}
+ public static AMQPConnectionDetails discoverAMQP(CamelContext camelContext) {
+ try {
+ PropertiesComponent propertiesComponent = camelContext.getComponent("properties", PropertiesComponent.class);
+
+ String host = property(propertiesComponent, AMQP_HOST, "localhost");
+ int port = Integer.parseInt(property(propertiesComponent, AMQP_PORT , "5672"));
+ String username = property(propertiesComponent, AMQP_USERNAME, null);
+ String password = property(propertiesComponent, AMQP_PASSWORD, null);
+
+ return new AMQPConnectionDetails("amqp://" + host + ":" + port, username, password);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
public String uri() {
return uri;
}
@@ -46,4 +72,16 @@ public class AMQPConnectionDetails {
return password;
}
+ // Helpers
+
+ private static String property(PropertiesComponent propertiesComponent, String key, String defaultValue) {
+ try {
+ return propertiesComponent.parseUri(propertiesComponent.getPrefixToken() + key + propertiesComponent.getSuffixToken());
+ } catch (IllegalArgumentException e) {
+ return defaultValue;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/975e8808/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index fa7319d..e7303fc 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.impl.PropertyPlaceholderDelegateRegistry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.AfterClass;
@@ -29,6 +30,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent;
+import static org.apache.camel.component.amqp.AMQPConnectionDetails.AMQP_PORT;
+import static org.apache.camel.component.amqp.AMQPConnectionDetails.discoverAMQP;
public class AMQPRouteTest extends CamelTestSupport {
@@ -47,6 +50,8 @@ public class AMQPRouteTest extends CamelTestSupport {
broker.setPersistent(false);
broker.addConnector("amqp://0.0.0.0:" + amqpPort);
broker.start();
+
+ System.setProperty(AMQP_PORT, amqpPort + "");
}
@AfterClass
@@ -97,12 +102,13 @@ public class AMQPRouteTest extends CamelTestSupport {
@Override
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry registry = super.createRegistry();
- registry.bind("amqpConnection", new AMQPConnectionDetails("amqp://localhost:" + amqpPort));
return registry;
}
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
+ JndiRegistry registry = (JndiRegistry)((PropertyPlaceholderDelegateRegistry)camelContext.getRegistry()).getRegistry();
+ registry.bind("amqpConnection", discoverAMQP(camelContext));
camelContext.addComponent("amqp-customized", amqpComponent("amqp://localhost:" + amqpPort));
return camelContext;
}
[03/13] camel git commit: [CAMEL-9381] Upgraded AMQP to
qpid-jms-client.
Posted by ac...@apache.org.
[CAMEL-9381] Upgraded AMQP to qpid-jms-client.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6bc17f21
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6bc17f21
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6bc17f21
Branch: refs/heads/camel-2.16.x
Commit: 6bc17f21362834c9b244a9228a4946ddddfcae6c
Parents: 84a4332
Author: Henryk Konsek <he...@gmail.com>
Authored: Tue Dec 1 16:30:22 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:26:46 2016 +0100
----------------------------------------------------------------------
components/camel-amqp/pom.xml | 22 ++++++--
.../camel/component/amqp/AMQPComponent.java | 11 ++--
.../camel/component/amqp/AMQPRouteTest.java | 20 +++----
.../camel-amqp/src/test/resources/config.json | 27 ---------
.../camel-amqp/src/test/resources/log4j.xml | 37 -------------
components/camel-amqp/src/test/resources/passwd | 23 --------
.../src/test/resources/virtualhosts.xml | 58 --------------------
parent/pom.xml | 1 +
.../features/src/main/resources/features.xml | 4 +-
9 files changed, 34 insertions(+), 169 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6bc17f21/components/camel-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index c2f6891..0bc653d 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -30,6 +30,13 @@
<description>Camel AMQP component which is based on the Apache Qid project</description>
<properties>
+ <!-- Wrapped qpid-jms-client requires invalid version of the package.
+ Remove this after migration to ServiceMix bundles. -->
+ <camel.osgi.import>
+ org.apache.qpid.jms,
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import>
<camel.osgi.export.pkg>org.apache.camel.component.amqp.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=amqp</camel.osgi.export.service>
</properties>
@@ -46,8 +53,8 @@
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-amqp-1-0-client-jms</artifactId>
- <version>${qpid-version}</version>
+ <artifactId>qpid-jms-client</artifactId>
+ <version>${qpid-jms-client-version}</version>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
@@ -57,9 +64,14 @@
<!-- testing -->
<dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-broker</artifactId>
- <version>${qpid-version}</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-amqp</artifactId>
+ <version>${activemq-version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/6bc17f21/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index 6397fd4..383b960 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -24,8 +24,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.jms.JmsConfiguration;
-import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
-import org.apache.qpid.client.AMQConnectionFactory;
+import org.apache.qpid.jms.JmsConnectionFactory;
/**
* This component supports the AMQP protocol using the Client API of the Apache Qpid project.
@@ -52,19 +51,19 @@ public class AMQPComponent extends JmsComponent {
if (old) {
return amqpComponentOld(uri);
}
- return new AMQPComponent(ConnectionFactoryImpl.createFromURL(uri));
+ return new AMQPComponent(new JmsConnectionFactory(uri));
}
public static Component amqpComponentOld(String uri) throws URISyntaxException {
- return new AMQPComponent(new AMQConnectionFactory(uri));
+ return new AMQPComponent(new JmsConnectionFactory(uri));
}
public static Component amqpComponent(String uri) throws MalformedURLException {
- return new AMQPComponent(ConnectionFactoryImpl.createFromURL(uri));
+ return new AMQPComponent(new JmsConnectionFactory(uri));
}
public static AMQPComponent amqp10Component(String uri) throws MalformedURLException {
- ConnectionFactoryImpl connectionFactory = ConnectionFactoryImpl.createFromURL(uri);
+ JmsConnectionFactory connectionFactory = new JmsConnectionFactory(uri);
connectionFactory.setTopicPrefix("topic://");
return new AMQPComponent(connectionFactory);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6bc17f21/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index 1b63ad8..e78e035 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -16,12 +16,11 @@
*/
package org.apache.camel.component.amqp;
+import org.apache.activemq.broker.BrokerService;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.qpid.server.Broker;
-import org.apache.qpid.server.BrokerOptions;
import org.junit.Before;
import org.junit.Test;
@@ -29,7 +28,7 @@ import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent;
public class AMQPRouteTest extends CamelTestSupport {
protected MockEndpoint resultEndpoint;
- protected Broker broker;
+ protected BrokerService broker;
@Test
public void testJmsRouteWithTextMessage() throws Exception {
@@ -45,13 +44,10 @@ public class AMQPRouteTest extends CamelTestSupport {
@Before
public void setUp() throws Exception {
- BrokerOptions options = new BrokerOptions();
- options.setConfigurationStoreType("memory");
- options.setInitialConfigurationLocation("src/test/resources/config.json");
- options.setLogConfigFileLocation("src/test/resources/log4j.xml");
-
- broker = new Broker();
- broker.startup(options);
+ broker = new BrokerService();
+ broker.setPersistent(false);
+ broker.addConnector("amqp://0.0.0.0:5672");
+ broker.start();
super.setUp();
resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
@@ -60,12 +56,12 @@ public class AMQPRouteTest extends CamelTestSupport {
@Override
public void tearDown() throws Exception {
super.tearDown();
- broker.shutdown();
+ broker.stop();
}
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("amqp1-0", amqpComponent("amqp://guest:guest@localhost:5672?remote-host=test", false));
+ camelContext.addComponent("amqp1-0", amqpComponent("amqp://localhost:5672", false));
return camelContext;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/6bc17f21/components/camel-amqp/src/test/resources/config.json
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/resources/config.json b/components/camel-amqp/src/test/resources/config.json
deleted file mode 100644
index 915f325..0000000
--- a/components/camel-amqp/src/test/resources/config.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "Broker",
- "defaultVirtualHost": "test",
- "modelVersion": "1.0",
- "storeVersion": 1,
- "authenticationproviders": [
- {
- "name": "passwordFile",
- "path": "src/test/resources/passwd",
- "type": "PlainPasswordFile"
- }
- ],
- "ports": [
- {
- "authenticationProvider": "passwordFile",
- "name": "AMQP",
- "port": "5672"
- }
- ],
- "virtualhosts": [
- {
- "name": "test",
- "type" : "VirtualHost",
- "configPath": "src/test/resources/virtualhosts.xml"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/6bc17f21/components/camel-amqp/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/resources/log4j.xml b/components/camel-amqp/src/test/resources/log4j.xml
deleted file mode 100644
index 688a10b..0000000
--- a/components/camel-amqp/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" >
-<log4j:configuration>
- <appender name="stdout" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE}
- %5p %c{1} - %m%n"/>
- </layout>
- </appender>
- <appender name="file" class="org.apache.log4j.FileAppender">
- <param name="file" value="target/camel-amqp-test.log"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE}
- %5p %c{1} - %m%n"/>
- </layout>
- </appender>
- <root>
- <priority value="info"></priority>
- <appender-ref ref="file"/>
- </root>
-</log4j:configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/6bc17f21/components/camel-amqp/src/test/resources/passwd
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/resources/passwd b/components/camel-amqp/src/test/resources/passwd
deleted file mode 100644
index 99f0f05..0000000
--- a/components/camel-amqp/src/test/resources/passwd
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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.
-#
-guest:guest
-client:guest
-server:guest
-admin:admin
-
http://git-wip-us.apache.org/repos/asf/camel/blob/6bc17f21/components/camel-amqp/src/test/resources/virtualhosts.xml
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/resources/virtualhosts.xml b/components/camel-amqp/src/test/resources/virtualhosts.xml
deleted file mode 100644
index 091386b..0000000
--- a/components/camel-amqp/src/test/resources/virtualhosts.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 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.
--->
-<virtualhosts>
- <default>test</default>
- <virtualhost>
- <name>test</name>
- <test>
- <store>
- <class>org.apache.qpid.server.store.MemoryMessageStore</class>
- </store>
- <queues>
- <minimumAlertRepeatGap>30000</minimumAlertRepeatGap>
- <maximumMessageCount>50</maximumMessageCount>
- <queue>
- <name>queue</name>
- <queue>
- <exchange>amq.direct</exchange>
- <maximumQueueDepth>4235264</maximumQueueDepth>
- <!-- 4Mb -->
- <maximumMessageSize>2117632</maximumMessageSize>
- <!-- 2Mb -->
- <maximumMessageAge>600000</maximumMessageAge>
- <!-- 10 mins -->
- </queue>
- </queue>
- <queue>
- <name>ping</name>
- <ping>
- <exchange>amq.direct</exchange>
- <maximumQueueDepth>4235264</maximumQueueDepth>
- <!-- 4Mb -->
- <maximumMessageSize>2117632</maximumMessageSize>
- <!-- 2Mb -->
- <maximumMessageAge>600000</maximumMessageAge>
- <!-- 10 mins -->
- </ping>
- </queue>
- </queues>
- </test>
- </virtualhost>
-</virtualhosts>
-
-
http://git-wip-us.apache.org/repos/asf/camel/blob/6bc17f21/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ba6ad7d..e7b2e88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -414,6 +414,7 @@
<protobuf-version>2.6.1</protobuf-version>
<qpid-bundle-version>0.28_1</qpid-bundle-version>
<qpid-version>0.28</qpid-version>
+ <qpid-jms-client-version>0.6.0</qpid-jms-client-version>
<quartz-bundle-version>1.8.6_1</quartz-bundle-version>
<quartz-version>1.8.6</quartz-version>
<quartz-version-range>[1.8,2)</quartz-version-range>
http://git-wip-us.apache.org/repos/asf/camel/blob/6bc17f21/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 6536248..d54b169 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -81,7 +81,9 @@
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/${qpid-bundle-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-client-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.apache.qpid/proton-j/0.10</bundle>
+ <bundle dependency='true'>wrap:mvn:io.netty/netty-all/4.0.17.Final</bundle>
<feature version='${project.version}'>camel-jms</feature>
<bundle>mvn:org.apache.camel/camel-amqp/${project.version}</bundle>
</feature>
[04/13] camel git commit: Removed unused test class.
Posted by ac...@apache.org.
Removed unused test class.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/77229016
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/77229016
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/77229016
Branch: refs/heads/camel-2.16.x
Commit: 7722901609f2383348d4ae43b7c14b3910b5cbe7
Parents: 6bc17f2
Author: Henryk Konsek <he...@gmail.com>
Authored: Tue Dec 1 16:36:12 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:27:35 2016 +0100
----------------------------------------------------------------------
.../camel/component/amqp/PurchaseOrder.java | 69 --------------------
1 file changed, 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/77229016/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/PurchaseOrder.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/PurchaseOrder.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/PurchaseOrder.java
deleted file mode 100644
index 5b10f1f..0000000
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/PurchaseOrder.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * 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.camel.component.amqp;
-
-import java.io.Serializable;
-
-/**
- * A simple POJO for testing
- *
- * @version
- */
-public class PurchaseOrder implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String product;
- private double amount;
-
- public PurchaseOrder(String product, double amount) {
- this.product = product;
- this.amount = amount;
- }
-
- @Override
- public boolean equals(Object other) {
- if (this == other) {
- return true;
- }
- if (other == null) {
- return false;
- }
- if (this.getClass() != other.getClass()) {
- return false;
- }
- PurchaseOrder that = (PurchaseOrder) other;
- return this.product.equals(that.product) && this.amount == that.amount;
- }
-
- @Override
- public int hashCode() {
- return product.hashCode() * 37 + (int) Math.round(amount);
- }
-
- @Override
- public String toString() {
- return "PurchaseOrder[" + product + " x " + amount + "]";
- }
-
- public double getAmount() {
- return amount;
- }
-
- public String getProduct() {
- return product;
- }
-}
\ No newline at end of file
[05/13] camel git commit: Added AMQP topic tests.
Posted by ac...@apache.org.
Added AMQP topic tests.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1b0ce863
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1b0ce863
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1b0ce863
Branch: refs/heads/camel-2.16.x
Commit: 1b0ce863408ddde61bb581f0dc643abc8dac65cd
Parents: 7722901
Author: Henryk Konsek <he...@gmail.com>
Authored: Tue Dec 1 16:37:20 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:27:56 2016 +0100
----------------------------------------------------------------------
.../camel/component/amqp/AMQPRouteTest.java | 30 +++++++++++++++-----
1 file changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1b0ce863/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index e78e035..e2a6f15 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -24,23 +24,31 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent;
+import static org.apache.camel.component.amqp.AMQPComponent.amqp10Component;
public class AMQPRouteTest extends CamelTestSupport {
+
protected MockEndpoint resultEndpoint;
+
protected BrokerService broker;
-
- @Test
- public void testJmsRouteWithTextMessage() throws Exception {
- String expectedBody = "Hello there!";
- resultEndpoint.reset();
+ String expectedBody = "Hello there!";
+
+ @Test
+ public void testJmsQueue() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.message(0).header("cheese").isEqualTo(123);
template.sendBodyAndHeader("amqp1-0:queue:ping", expectedBody, "cheese", 123);
resultEndpoint.assertIsSatisfied();
}
+ @Test
+ public void testJmsTopic() throws Exception {
+ resultEndpoint.expectedMessageCount(2);
+ resultEndpoint.message(0).header("cheese").isEqualTo(123);
+ template.sendBodyAndHeader("amqp1-0:topic:ping", expectedBody, "cheese", 123);
+ resultEndpoint.assertIsSatisfied();
+ }
@Before
public void setUp() throws Exception {
@@ -61,7 +69,7 @@ public class AMQPRouteTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("amqp1-0", amqpComponent("amqp://localhost:5672", false));
+ camelContext.addComponent("amqp1-0", amqp10Component("amqp://localhost:5672"));
return camelContext;
}
@@ -71,6 +79,14 @@ public class AMQPRouteTest extends CamelTestSupport {
from("amqp1-0:queue:ping")
.to("log:routing")
.to("mock:result");
+
+ from("amqp1-0:topic:ping")
+ .to("log:routing")
+ .to("mock:result");
+
+ from("amqp1-0:topic:ping")
+ .to("log:routing")
+ .to("mock:result");
}
};
}
[06/13] camel git commit: [CAMEL-9381] Upgraded AMQP factory methods.
Posted by ac...@apache.org.
[CAMEL-9381] Upgraded AMQP factory methods.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/57f3ce7f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/57f3ce7f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/57f3ce7f
Branch: refs/heads/camel-2.16.x
Commit: 57f3ce7f1c52a0bdc724c368009bb4c864b0e453
Parents: 1b0ce86
Author: Henryk Konsek <he...@gmail.com>
Authored: Tue Dec 1 17:14:21 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:28:14 2016 +0100
----------------------------------------------------------------------
.../camel/component/amqp/AMQPComponent.java | 23 ++++++++------------
.../camel/component/amqp/AMQPRouteTest.java | 4 ++--
2 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/57f3ce7f/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index 383b960..e326cf44 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -47,22 +47,17 @@ public class AMQPComponent extends JmsComponent {
setConnectionFactory(connectionFactory);
}
- public static Component amqpComponent(String uri, boolean old) throws MalformedURLException, URISyntaxException {
- if (old) {
- return amqpComponentOld(uri);
- }
- return new AMQPComponent(new JmsConnectionFactory(uri));
- }
-
- public static Component amqpComponentOld(String uri) throws URISyntaxException {
- return new AMQPComponent(new JmsConnectionFactory(uri));
- }
-
- public static Component amqpComponent(String uri) throws MalformedURLException {
- return new AMQPComponent(new JmsConnectionFactory(uri));
+ /**
+ * Use {@code amqpComponent(String uri)} instead.
+ */
+ @Deprecated
+ public static AMQPComponent amqp10Component(String uri) throws MalformedURLException {
+ JmsConnectionFactory connectionFactory = new JmsConnectionFactory(uri);
+ connectionFactory.setTopicPrefix("topic://");
+ return new AMQPComponent(connectionFactory);
}
- public static AMQPComponent amqp10Component(String uri) throws MalformedURLException {
+ public static AMQPComponent amqpComponent(String uri) {
JmsConnectionFactory connectionFactory = new JmsConnectionFactory(uri);
connectionFactory.setTopicPrefix("topic://");
return new AMQPComponent(connectionFactory);
http://git-wip-us.apache.org/repos/asf/camel/blob/57f3ce7f/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index e2a6f15..73ac9e0 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.camel.component.amqp.AMQPComponent.amqp10Component;
+import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent;
public class AMQPRouteTest extends CamelTestSupport {
@@ -69,7 +69,7 @@ public class AMQPRouteTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("amqp1-0", amqp10Component("amqp://localhost:5672"));
+ camelContext.addComponent("amqp1-0", amqpComponent("amqp://localhost:5672"));
return camelContext;
}
[12/13] camel git commit: [camel-amqp] Added missing topic
pre-configuration.
Posted by ac...@apache.org.
[camel-amqp] Added missing topic pre-configuration.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4d169c98
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4d169c98
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4d169c98
Branch: refs/heads/camel-2.16.x
Commit: 4d169c984b1b94c9e24532dc29ef05f4418af120
Parents: 6987fb9
Author: Henryk Konsek <he...@gmail.com>
Authored: Thu Dec 3 13:27:46 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:30:00 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/amqp/AMQPComponent.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4d169c98/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index dc4c2ed..6dd8226 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -55,7 +55,9 @@ public class AMQPComponent extends JmsComponent {
Set<AMQPConnectionDetails> connectionDetails = getCamelContext().getRegistry().findByType(AMQPConnectionDetails.class);
if (connectionDetails.size() == 1) {
AMQPConnectionDetails details = connectionDetails.iterator().next();
- setConnectionFactory(new JmsConnectionFactory(details.username(), details.password(), details.uri()));
+ JmsConnectionFactory connectionFactory = new JmsConnectionFactory(details.username(), details.password(), details.uri());
+ connectionFactory.setTopicPrefix("topic://");
+ setConnectionFactory(connectionFactory);
}
super.doStart();
}
[09/13] camel git commit: [camel-amqp] Avoiding tests' port conflicts.
Posted by ac...@apache.org.
[camel-amqp] Avoiding tests' port conflicts.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/940077a4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/940077a4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/940077a4
Branch: refs/heads/camel-2.16.x
Commit: 940077a429a46b9561ae9cf01578e6f2852998d5
Parents: a7f1846
Author: Henryk Konsek <he...@gmail.com>
Authored: Thu Dec 3 12:17:54 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:29:08 2016 +0100
----------------------------------------------------------------------
.../camel/component/amqp/AMQPRouteTest.java | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/940077a4/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index d5d37db..ce89bc6 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -21,6 +21,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -30,6 +31,8 @@ import static org.apache.camel.component.amqp.AMQPComponent.amqpComponent;
public class AMQPRouteTest extends CamelTestSupport {
+ static int amqpPort = AvailablePortFinder.getNextAvailable();
+
static BrokerService broker;
@EndpointInject(uri = "mock:result")
@@ -41,7 +44,7 @@ public class AMQPRouteTest extends CamelTestSupport {
public static void beforeClass() throws Exception {
broker = new BrokerService();
broker.setPersistent(false);
- broker.addConnector("amqp://0.0.0.0:5672");
+ broker.addConnector("amqp://0.0.0.0:" + amqpPort);
broker.start();
}
@@ -54,13 +57,13 @@ public class AMQPRouteTest extends CamelTestSupport {
public void testJmsQueue() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.message(0).header("cheese").isEqualTo(123);
- template.sendBodyAndHeader("amqp1-0:queue:ping", expectedBody, "cheese", 123);
+ template.sendBodyAndHeader("amqp:queue:ping", expectedBody, "cheese", 123);
resultEndpoint.assertIsSatisfied();
}
@Test
public void testRequestReply() {
- String response = template.requestBody("amqp1-0:queue:inOut", expectedBody, String.class);
+ String response = template.requestBody("amqp:queue:inOut", expectedBody, String.class);
assertEquals("response", response);
}
@@ -68,31 +71,31 @@ public class AMQPRouteTest extends CamelTestSupport {
public void testJmsTopic() throws Exception {
resultEndpoint.expectedMessageCount(2);
resultEndpoint.message(0).header("cheese").isEqualTo(123);
- template.sendBodyAndHeader("amqp1-0:topic:ping", expectedBody, "cheese", 123);
+ template.sendBodyAndHeader("amqp:topic:ping", expectedBody, "cheese", 123);
resultEndpoint.assertIsSatisfied();
}
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("amqp1-0", amqpComponent("amqp://localhost:5672"));
+ camelContext.addComponent("amqp", amqpComponent("amqp://localhost:" + amqpPort));
return camelContext;
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("amqp1-0:queue:ping")
+ from("amqp:queue:ping")
.to("log:routing")
.to("mock:result");
- from("amqp1-0:queue:inOut")
+ from("amqp:queue:inOut")
.setBody().constant("response");
- from("amqp1-0:topic:ping")
+ from("amqp:topic:ping")
.to("log:routing")
.to("mock:result");
- from("amqp1-0:topic:ping")
+ from("amqp:topic:ping")
.to("log:routing")
.to("mock:result");
}
[11/13] camel git commit: [camel-amqp] Added AMQP connection details.
Posted by ac...@apache.org.
[camel-amqp] Added AMQP connection details.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6987fb90
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6987fb90
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6987fb90
Branch: refs/heads/camel-2.16.x
Commit: 6987fb909b2880eacda9fff22e936358d71497fa
Parents: 160f02d
Author: Henryk Konsek <he...@gmail.com>
Authored: Thu Dec 3 13:16:30 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Feb 29 09:29:40 2016 +0100
----------------------------------------------------------------------
.../camel/component/amqp/AMQPComponent.java | 13 ++++++
.../component/amqp/AMQPConnectionDetails.java | 49 ++++++++++++++++++++
.../camel/component/amqp/AMQPRouteTest.java | 36 +++++++++-----
3 files changed, 86 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6987fb90/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index 8dcf7e6..dc4c2ed 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.amqp;
import java.net.MalformedURLException;
+import java.util.Set;
import javax.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
@@ -47,6 +48,18 @@ public class AMQPComponent extends JmsComponent {
setConnectionFactory(connectionFactory);
}
+ // Life-cycle
+
+ @Override
+ protected void doStart() throws Exception {
+ Set<AMQPConnectionDetails> connectionDetails = getCamelContext().getRegistry().findByType(AMQPConnectionDetails.class);
+ if (connectionDetails.size() == 1) {
+ AMQPConnectionDetails details = connectionDetails.iterator().next();
+ setConnectionFactory(new JmsConnectionFactory(details.username(), details.password(), details.uri()));
+ }
+ super.doStart();
+ }
+
// Factory methods
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/6987fb90/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.java
new file mode 100644
index 0000000..545bd27
--- /dev/null
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConnectionDetails.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.camel.component.amqp;
+
+public class AMQPConnectionDetails {
+
+ private final String uri;
+
+ private final String username;
+
+ private final String password;
+
+ public AMQPConnectionDetails(String uri, String username, String password) {
+ this.uri = uri;
+ this.username = username;
+ this.password = password;
+ }
+
+ public AMQPConnectionDetails(String uri) {
+ this(uri, null, null);
+ }
+
+ public String uri() {
+ return uri;
+ }
+
+ public String username() {
+ return username;
+ }
+
+ public String password() {
+ return password;
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/6987fb90/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index 3ed0935..fa7319d 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -20,8 +20,8 @@ import org.apache.activemq.broker.BrokerService;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jms.JmsConstants;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.AfterClass;
@@ -58,13 +58,13 @@ public class AMQPRouteTest extends CamelTestSupport {
public void testJmsQueue() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.message(0).header("cheese").isEqualTo(123);
- template.sendBodyAndHeader("amqp:queue:ping", expectedBody, "cheese", 123);
+ template.sendBodyAndHeader("amqp-customized:queue:ping", expectedBody, "cheese", 123);
resultEndpoint.assertIsSatisfied();
}
@Test
public void testRequestReply() {
- String response = template.requestBody("amqp:queue:inOut", expectedBody, String.class);
+ String response = template.requestBody("amqp-customized:queue:inOut", expectedBody, String.class);
assertEquals("response", response);
}
@@ -72,14 +72,14 @@ public class AMQPRouteTest extends CamelTestSupport {
public void testJmsTopic() throws Exception {
resultEndpoint.expectedMessageCount(2);
resultEndpoint.message(0).header("cheese").isEqualTo(123);
- template.sendBodyAndHeader("amqp:topic:ping", expectedBody, "cheese", 123);
+ template.sendBodyAndHeader("amqp-customized:topic:ping", expectedBody, "cheese", 123);
resultEndpoint.assertIsSatisfied();
}
@Test
public void testPrefixWildcard() throws Exception {
resultEndpoint.expectedMessageCount(1);
- template.sendBody("amqp:wildcard.foo.bar", expectedBody);
+ template.sendBody("amqp-customized:wildcard.foo.bar", expectedBody);
resultEndpoint.assertIsSatisfied();
}
@@ -87,37 +87,49 @@ public class AMQPRouteTest extends CamelTestSupport {
public void testIncludeDestination() throws Exception {
resultEndpoint.expectedMessageCount(1);
resultEndpoint.message(0).header("JMSDestination").isEqualTo("ping");
- template.sendBody("amqp:queue:ping", expectedBody);
+ template.sendBody("amqp-customized:queue:ping", expectedBody);
resultEndpoint.assertIsSatisfied();
}
// Routes fixtures
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry registry = super.createRegistry();
+ registry.bind("amqpConnection", new AMQPConnectionDetails("amqp://localhost:" + amqpPort));
+ return registry;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("amqp", amqpComponent("amqp://localhost:" + amqpPort));
+ camelContext.addComponent("amqp-customized", amqpComponent("amqp://localhost:" + amqpPort));
return camelContext;
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("amqp:queue:ping")
+ from("amqp-customized:queue:ping")
.to("log:routing")
.to("mock:result");
- from("amqp:queue:inOut")
+ from("amqp-customized:queue:inOut")
.setBody().constant("response");
- from("amqp:topic:ping")
+ from("amqp-customized:topic:ping")
+ .to("log:routing")
+ .to("mock:result");
+
+ from("amqp-customized:topic:ping")
.to("log:routing")
.to("mock:result");
- from("amqp:topic:ping")
+ from("amqp-customized:queue:wildcard.>")
.to("log:routing")
.to("mock:result");
- from("amqp:queue:wildcard.>")
+ from("amqp:queue:uriEndpoint")
.to("log:routing")
.to("mock:result");
}