You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/03/29 05:55:20 UTC

[1/3] camel git commit: Fix camel-olingo4 pom

Repository: camel
Updated Branches:
  refs/heads/master 29d3f1c11 -> 16af8d08d


Fix camel-olingo4 pom


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d999d6b7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d999d6b7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d999d6b7

Branch: refs/heads/master
Commit: d999d6b7de46407dc4a00544dd3e74f3dc198307
Parents: 29d3f1c
Author: lburgazzoli <lb...@gmail.com>
Authored: Wed Mar 29 07:53:27 2017 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Wed Mar 29 07:53:27 2017 +0200

----------------------------------------------------------------------
 .../camel-olingo4/camel-olingo4-component/pom.xml      | 13 +------------
 .../components-starter/camel-olingo4-starter/pom.xml   |  8 --------
 2 files changed, 1 insertion(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d999d6b7/components/camel-olingo4/camel-olingo4-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo4/camel-olingo4-component/pom.xml b/components/camel-olingo4/camel-olingo4-component/pom.xml
index 6c9c988..4479dd5 100644
--- a/components/camel-olingo4/camel-olingo4-component/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-component/pom.xml
@@ -83,18 +83,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>redhat-ga-repository</id>
-      <url>https://maven.repository.redhat.com/ga</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>redhat-ga-repository</id>
-      <url>https://maven.repository.redhat.com/ga</url>
-    </pluginRepository>
-  </pluginRepositories>
   <build>
     <defaultGoal>install</defaultGoal>
     <pluginManagement>
@@ -102,6 +90,7 @@
         <plugin>
           <groupId>org.apache.camel</groupId>
           <artifactId>camel-api-component-maven-plugin</artifactId>
+          <version>${project.version}</version>
           <configuration>
             <scheme>${schemeName}</scheme>
             <componentName>${componentName}</componentName>

http://git-wip-us.apache.org/repos/asf/camel/blob/d999d6b7/platforms/spring-boot/components-starter/camel-olingo4-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-olingo4-starter/pom.xml b/platforms/spring-boot/components-starter/camel-olingo4-starter/pom.xml
index cd14a04..095d2d2 100644
--- a/platforms/spring-boot/components-starter/camel-olingo4-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-olingo4-starter/pom.xml
@@ -56,12 +56,4 @@
     </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
-  <!--START OF GENERATED CODE-->
-  <repositories>
-    <repository>
-      <id>redhat-ga-repository</id>
-      <url>https://maven.repository.redhat.com/ga</url>
-    </repository>
-  </repositories>
-  <!--END OF GENERATED CODE-->
 </project>


[2/3] camel git commit: ComponentVerifier: add parameters validation test for camel-http

Posted by lb...@apache.org.
ComponentVerifier: add parameters validation test for camel-http


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6e878336
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6e878336
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6e878336

Branch: refs/heads/master
Commit: 6e8783362907dbe54562adc7715d2ab531461a06
Parents: d999d6b
Author: lburgazzoli <lb...@gmail.com>
Authored: Wed Mar 29 07:54:21 2017 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Wed Mar 29 07:54:21 2017 +0200

----------------------------------------------------------------------
 .../http/CamelComponentVerifierTest.java        | 35 ++++++++++++++++++++
 1 file changed, 35 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/6e878336/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
index 4db9137..c224946 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
@@ -83,6 +83,41 @@ public class CamelComponentVerifierTest extends BaseHttpTest {
     // *************************************************
 
     @Test
+    public void testParameters() throws Exception {
+        HttpComponent component = context().getComponent("http", HttpComponent.class);
+        HttpComponentVerifier verifier = (HttpComponentVerifier)component.getVerifier();
+
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("httpUri", getLocalServerUri("/basic"));
+
+        ComponentVerifier.Result result = verifier.verify(ComponentVerifier.Scope.PARAMETERS, parameters);
+
+        Assert.assertEquals(ComponentVerifier.Result.Status.OK, result.getStatus());
+    }
+
+    @Test
+    public void testMissingMandatoryParameters() throws Exception {
+        HttpComponent component = context().getComponent("http", HttpComponent.class);
+        HttpComponentVerifier verifier = (HttpComponentVerifier)component.getVerifier();
+
+        Map<String, Object> parameters = new HashMap<>();
+
+        ComponentVerifier.Result result = verifier.verify(ComponentVerifier.Scope.PARAMETERS, parameters);
+
+        Assert.assertEquals(ComponentVerifier.Result.Status.ERROR, result.getStatus());
+        Assert.assertEquals(1, result.getErrors().size());
+
+        ComponentVerifier.Error error = result.getErrors().get(0);
+
+        Assert.assertEquals(ComponentVerifier.CODE_MISSING_OPTION, error.getCode());
+        Assert.assertTrue(error.getParameters().contains("httpUri"));
+    }
+
+    // *************************************************
+    // Tests
+    // *************************************************
+
+    @Test
     public void testConnectivity() throws Exception {
         HttpComponent component = context().getComponent("http", HttpComponent.class);
         HttpComponentVerifier verifier = (HttpComponentVerifier)component.getVerifier();


[3/3] camel git commit: Fix cyclic dependency issue

Posted by lb...@apache.org.
Fix cyclic dependency issue


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16af8d08
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16af8d08
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16af8d08

Branch: refs/heads/master
Commit: 16af8d08d851ef7a9e3dc62d1e99a96f3aa18587
Parents: 6e87833
Author: lburgazzoli <lb...@gmail.com>
Authored: Wed Mar 29 07:54:45 2017 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Wed Mar 29 07:54:45 2017 +0200

----------------------------------------------------------------------
 .../spring-boot/components-starter/camel-core-starter/pom.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/16af8d08/platforms/spring-boot/components-starter/camel-core-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/pom.xml b/platforms/spring-boot/components-starter/camel-core-starter/pom.xml
index 49159da..c1a8918 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-core-starter/pom.xml
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring-boot-starter</artifactId>
+      <artifactId>camel-spring-boot</artifactId>
       <scope>test</scope>
     </dependency>
     <!--START OF GENERATED CODE-->