camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/5] camel git commit: CAMEL-7999: Added path kind option to explained options in endpoints.
Date Wed, 12 Nov 2014 19:43:19 GMT
CAMEL-7999: Added path kind option to explained options in endpoints.


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

Branch: refs/heads/master
Commit: c0db07f1aff80ae5c4dcd1695c4b7cd9a13e6ccf
Parents: d93161b
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Nov 12 19:50:08 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Nov 12 19:50:08 2014 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 4 ++++
 .../mail/MailComponentConfigurationAndDocumentationTest.java     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c0db07f1/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 7f9fc54..139f59b 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -1176,6 +1176,10 @@ public class DefaultCamelContext extends ServiceSupport implements
ModelCamelCon
             return "event";
         } else if ("class".equals(componentName)) {
             return "beanclass";
+        } else if ("smtp".equals(componentName) || "smtps".equals(componentName)
+                || "imap".equals(componentName) || "imaps".equals(componentName)
+                || "pop3".equals(componentName) || "pop3s".equals(componentName)) {
+            return "mail";
         }
         return componentName.replaceAll("-", "");
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/c0db07f1/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentConfigurationAndDocumentationTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentConfigurationAndDocumentationTest.java
index 5ecff06..63bc617 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentConfigurationAndDocumentationTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentConfigurationAndDocumentationTest.java
@@ -49,7 +49,7 @@ public class MailComponentConfigurationAndDocumentationTest extends CamelTestSup
     @Test
     public void testComponentDocumentation() throws Exception {
         CamelContext context = new DefaultCamelContext();
-        String html = context.getComponentDocumentation("mail");
+        String html = context.getComponentDocumentation("smtp");
         assertNotNull("Should have found some auto-generated HTML", html);
     }
 


Mime
View raw message