[camel] 14/17: CAMEL-13449: camel3 - Move bean component out of camel-core

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch bean
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 9649e6805666970cc15660c59bf09863bdd9d658
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 25 11:40:19 2019 +0200

    CAMEL-13449: camel3 - Move bean component out of camel-core
---
 .../component/bean/MyBeanBindingConsumer.java      |  2 +-
 .../annotation-based-expression-language.adoc      | 48 +++++-----------------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java b/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
index f6de0c0..114b1fc 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.bean;
 import org.apache.camel.Consume;
 import org.apache.camel.Header;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.language.Bean;
+import org.apache.camel.language.bean.Bean;
 import org.apache.camel.language.Constant;
 
 /**
diff --git a/docs/user-manual/modules/ROOT/pages/annotation-based-expression-language.adoc b/docs/user-manual/modules/ROOT/pages/annotation-based-expression-language.adoc
index fdea7fe..ebb46da 100644
--- a/docs/user-manual/modules/ROOT/pages/annotation-based-expression-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/annotation-based-expression-language.adoc
@@ -9,50 +9,25 @@ any of these annotations:
 [width="100%",cols="50%,50%",options="header",]
 |=======================================================================
 |Annotation |Description
-|http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/language/Bean.html[@Bean]
-|Inject a <<bean-language,Bean>> expression
+|@Bean |Inject a <<bean-language,Bean>> expression
 
-|http://camel.apache.org/maven/current/camel-script/apidocs/org/apache/camel/builder/script/BeanShell.html[@BeanShell]
-|Inject a <<beanshell-language,BeanShell>> expression
+|@Constant |Inject a <<constant-language,Constant>> expression
 
-|http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/language/Constant.html[@Constant]
-|Inject a <<constant-language,Constant>> expression
+|@EL |Inject an <<el-language,EL>> expression
 
-|http://camel.apache.org/maven/current/camel-juel/apidocs/org/apache/camel/language/juel/EL.html[@EL]
-|Inject an <<el-language,EL>> expression
+|@Groovy |Inject a <<groovy-language,Groovy>> expression
 
-|http://camel.apache.org/maven/current/camel-script/apidocs/org/apache/camel/builder/script/Groovy.html[@Groovy]
-|Inject a <<groovy-language,Groovy>> expression
+|@Header |Inject a <<header-language,Header>> expression
 
-|http://camel.apache.org/maven/current/maven/camel-core/apidocs/org/apache/camel/Header.html[@Header]
-|Inject a <<header-language,Header>> expression
+|@MVEL |Inject a <<mvel-language,MVEL>> expression
 
-|http://camel.apache.org/maven/current/camel-script/apidocs/org/apache/camel/builder/script/JavaScript.html[@JavaScript]
-|Inject a <<javascript-language,JavaScript>> expression
+|@OGNL |Inject an <<ognl-language,OGNL>> expression
 
-|http://camel.apache.org/maven/current/camel-mvel/apidocs/org/apache/camel/language/mvel/MVEL.html[@MVEL]
-|Inject a <<mvel-language,MVEL>> expression
+|@Simple |Inject an <<simple-language,Simple>> expression
 
-|http://camel.apache.org/maven/current/camel-ognl/apidocs/org/apache/camel/language/ognl/OGNL.html[@OGNL]
-|Inject an <<ognl-language,OGNL>> expression
+|@XPath |Inject an <<xpath-language,XPath>> expression
 
-|http://camel.apache.org/maven/current/camel-script/apidocs/org/apache/camel/builder/script/PHP.html[@PHP]
-|Inject a <<php-language,PHP>> expression
-
-|http://camel.apache.org/maven/current/camel-script/apidocs/org/apache/camel/builder/script/Python.html[@Python]
-|Inject a <<python-language,Python>> expression
-
-|http://camel.apache.org/maven/current/camel-script/apidocs/org/apache/camel/builder/script/Ruby.html[@Ruby]
-|Inject a <<ruby-language,Ruby>> expression
-
-|http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/language/Simple.html[@Simple]
-|Inject an <<simple-language,Simple>> expression
-
-|http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/language/XPath.html[@XPath]
-|Inject an <<xpath-language,XPath>> expression
-
-|http://camel.apache.org/maven/current/camel-saxon/apidocs/org/apache/camel/component/xquery/XQuery.html[@XQuery]
-|Inject an <<xquery-language,XQuery>> expression
+|@XQuery |Inject an <<xquery-language,XQuery>> expression
 |=======================================================================
 
 [[AnnotationBasedExpressionLanguage-Example]]
@@ -73,8 +48,7 @@ public class Foo {
 ===== Advanced example using @Bean
 
 And an example of using the the
-http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/language/Bean.html[@Bean]
-binding annotation, where you can use a <<bean-component,POJO>> where you
+@Bean binding annotation, where you can use a <<bean-component,POJO>> where you
 can do whatever java code you like:
 
 [source,java]