You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2016/08/18 15:04:39 UTC
camel git commit: CAMEL-10252: remove Maven property for older Weld
Arquillian adapter
Repository: camel
Updated Branches:
refs/heads/master ab299d7db -> 9752c5863
CAMEL-10252: remove Maven property for older Weld Arquillian adapter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9752c586
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9752c586
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9752c586
Branch: refs/heads/master
Commit: 9752c5863930d3c716a8019f3cc626f5d6aac659
Parents: ab299d7
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Thu Aug 18 17:04:31 2016 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Thu Aug 18 17:04:31 2016 +0200
----------------------------------------------------------------------
components/camel-cdi/pom.xml | 2 +-
.../cdi/test/DeploymentDescriptorTest.java | 68 ++++++++++++++++++++
parent/pom.xml | 2 -
3 files changed, 69 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9752c586/components/camel-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 3d4a285..0bd4880 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -222,7 +222,7 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-weld-se-embedded-1.1</artifactId>
- <version>${arquillian-weld-se-embedded-version}</version>
+ <version>1.0.0.CR9</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/9752c586/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
new file mode 100644
index 0000000..14844ae
--- /dev/null
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
@@ -0,0 +1,68 @@
+/**
+ * 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.cdi.test;
+
+import java.util.concurrent.TimeUnit;
+import javax.inject.Inject;
+
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.cdi.CdiCamelExtension;
+import org.apache.camel.cdi.Uri;
+import org.apache.camel.cdi.bean.EndpointInjectRoute;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
+
+@RunWith(Arquillian.class)
+public class DeploymentDescriptorTest {
+
+ @Inject
+ @Uri("direct:inbound")
+ private ProducerTemplate inbound;
+
+ @Inject
+ @Uri("mock:outbound")
+ private MockEndpoint outbound;
+
+ @Deployment
+ public static Archive<?> deployment() {
+ return ShrinkWrap.create(JavaArchive.class)
+ // Camel CDI
+ .addPackages(false, CdiCamelExtension.class.getPackage())
+ // Test class
+ .addClass(EndpointInjectRoute.class)
+ // Bean archive deployment descriptor
+ .addAsManifestResource("META-INF/beans.xml", "beans.xml");
+ }
+
+ @Test
+ public void sendMessageToInbound() throws InterruptedException {
+ outbound.expectedMessageCount(1);
+ outbound.expectedBodiesReceived("test");
+
+ inbound.sendBody("test");
+
+ assertIsSatisfied(2L, TimeUnit.SECONDS, outbound);
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/9752c586/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 69c1d6d..065b724 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -52,8 +52,6 @@
<aries-util-version>1.1.1</aries-util-version>
<arquillian-container-se-managed-version>1.0.0.Final</arquillian-container-se-managed-version>
<arquillian-version>1.1.11.Final</arquillian-version>
- <!-- To be removed when Weld 1.x is dropped -->
- <arquillian-weld-se-embedded-version>1.0.0.CR9</arquillian-weld-se-embedded-version>
<arquillian-weld-embedded-version>2.0.0.Beta2</arquillian-weld-embedded-version>
<asm-bundle-version>3.3.1_1</asm-bundle-version>
<asm-version>3.3.1</asm-version>