Fixed name resolution and added new components
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d5fb02a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d5fb02a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d5fb02a Branch: refs/heads/master Commit: 8d5fb02af8186831fd43025193a7cc7bec3490cc Parents: 68ad8ca Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Thu Jul 28 09:59:03 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 28 15:24:18 2016 +0200 ---------------------------------------------------------------------- .../cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java | 2 +- .../component/cxf/springboot/CxfComponentAutoConfiguration.java | 2 +- .../disruptor/springboot/DisruptorComponentAutoConfiguration.java | 2 +- .../vm/springboot/DisruptorVmComponentAutoConfiguration.java | 2 +- .../jetty9/springboot/JettyHttpComponentAutoConfiguration9.java | 2 +- .../component/scp/springboot/ScpComponentAutoConfiguration.java | 2 +- .../xquery/springboot/XQueryComponentAutoConfiguration.java | 2 +- .../sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java | 2 +- .../component/sjms/springboot/SjmsComponentAutoConfiguration.java | 2 +- .../event/springboot/EventComponentAutoConfiguration.java | 2 +- .../component/sql/springboot/SqlComponentAutoConfiguration.java | 2 +- .../sql/stored/springboot/SqlStoredComponentAutoConfiguration.java | 2 +- .../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java index e0ae938..52ada16 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(CxfRsComponentConfiguration.class) public class CxfRsComponentAutoConfiguration { - @Bean + @Bean(name = "cxfrs-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(CxfRsComponent.class) public CxfRsComponent configureCxfRsComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java index 7c24123..21f5c1e 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(CxfComponentConfiguration.class) public class CxfComponentAutoConfiguration { - @Bean + @Bean(name = "cxf-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(CxfComponent.class) public CxfComponent configureCxfComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java index dd065ce..03c9496 100644 --- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java +++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(DisruptorComponentConfiguration.class) public class DisruptorComponentAutoConfiguration { - @Bean + @Bean(name = "disruptor-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(DisruptorComponent.class) public DisruptorComponent configureDisruptorComponent( http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java index 300b9dc..44a630e 100644 --- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java +++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(DisruptorVmComponentConfiguration.class) public class DisruptorVmComponentAutoConfiguration { - @Bean + @Bean(name = "disruptor-vm-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(DisruptorVmComponent.class) public DisruptorVmComponent configureDisruptorVmComponent( http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java index 9718b63..d1f37a8 100644 --- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java +++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(JettyHttpComponentConfiguration9.class) public class JettyHttpComponentAutoConfiguration9 { - @Bean + @Bean(name = "jetty-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JettyHttpComponent9.class) public JettyHttpComponent9 configureJettyHttpComponent9( http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java index 20fe2b2..e5c0037 100644 --- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java +++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(ScpComponentConfiguration.class) public class ScpComponentAutoConfiguration { - @Bean + @Bean(name = "scp-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ScpComponent.class) public ScpComponent configureScpComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java index 0acab53..c52467f 100644 --- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java +++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(XQueryComponentConfiguration.class) public class XQueryComponentAutoConfiguration { - @Bean + @Bean(name = "xquery-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(XQueryComponent.class) public XQueryComponent configureXQueryComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java index 88d6d4c..e236e8e 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(SjmsBatchComponentConfiguration.class) public class SjmsBatchComponentAutoConfiguration { - @Bean + @Bean(name = "sjms-batch-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SjmsBatchComponent.class) public SjmsBatchComponent configureSjmsBatchComponent( http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java index 0b3a9ea..5683591 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(SjmsComponentConfiguration.class) public class SjmsComponentAutoConfiguration { - @Bean + @Bean(name = "sjms-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SjmsComponent.class) public SjmsComponent configureSjmsComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-spring/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java b/components/camel-spring/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java index b0561e1..38e9000 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java +++ b/components/camel-spring/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(EventComponentConfiguration.class) public class EventComponentAutoConfiguration { - @Bean + @Bean(name = "spring-event-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(EventComponent.class) public EventComponent configureEventComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-sql/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java index 44802fd..85c8dba 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(SqlComponentConfiguration.class) public class SqlComponentAutoConfiguration { - @Bean + @Bean(name = "sql-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SqlComponent.class) public SqlComponent configureSqlComponent(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java index 05cc45d..2ed59e1 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(SqlStoredComponentConfiguration.class) public class SqlStoredComponentAutoConfiguration { - @Bean + @Bean(name = "sql-stored-component") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SqlStoredComponent.class) public SqlStoredComponent configureSqlStoredComponent( http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java index aedcf49..06ccde5 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java @@ -158,7 +158,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { String pkg = model.getJavaType().substring(0, pos) + ".springboot"; String overrideComponentName = null; - if(aliases.size()>0) { + if(aliases.size()>1) { // determine component name when there are multiple ones overrideComponentName = model.getArtifactId().replace("camel-", ""); }
