You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/07/05 07:27:20 UTC
[1/2] camel git commit: CAMEL-10118: Adding activation via properties
to Zipkin Spring-boot
Repository: camel
Updated Branches:
refs/heads/master b44adfa4b -> a1d9c36ff
CAMEL-10118: Adding activation via properties to Zipkin Spring-boot
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1d9c36f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1d9c36f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1d9c36f
Branch: refs/heads/master
Commit: a1d9c36ffef2ffbb2ae038ef62fc1fc79005d98b
Parents: 70ee076
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Tue Jul 5 08:19:29 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 5 09:27:12 2016 +0200
----------------------------------------------------------------------
.../ZipkinConditionalAutoConfiguration.java | 15 +++++++++++++++
.../src/main/resources/META-INF/spring.factories | 19 +++++++++++++++++++
2 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a1d9c36f/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
new file mode 100644
index 0000000..28fd554
--- /dev/null
+++ b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
@@ -0,0 +1,15 @@
+package org.apache.camel.zipkin.starter;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * A configuration controller to enable Zipkin via the configuration property.
+ * Useful to bootstrap Zipkin when not using the {@link CamelZipkin} annotation.
+ */
+@Configuration
+@ConditionalOnProperty(value = "camel.zipkin.enabled")
+@Import(ZipkinAutoConfiguration.class)
+public class ZipkinConditionalAutoConfiguration {
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/a1d9c36f/components/camel-zipkin-starter/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components/camel-zipkin-starter/src/main/resources/META-INF/spring.factories b/components/camel-zipkin-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..94e7b6a
--- /dev/null
+++ b/components/camel-zipkin-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.camel.zipkin.starter.ZipkinConditionalAutoConfiguration
\ No newline at end of file
[2/2] camel git commit: CAMEL-10118: Fix Zipkin Spring-boot
configuration
Posted by da...@apache.org.
CAMEL-10118: Fix Zipkin Spring-boot configuration
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70ee0767
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70ee0767
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70ee0767
Branch: refs/heads/master
Commit: 70ee076714cd29dac35b145e593812ce9cac546f
Parents: b44adfa
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Mon Jul 4 18:45:45 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 5 09:27:12 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/META-INF/spring.factories | 19 -------------------
1 file changed, 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/70ee0767/components/camel-zipkin-starter/src/main/resources/META-INF/spring.factories
----------------------------------------------------------------------
diff --git a/components/camel-zipkin-starter/src/main/resources/META-INF/spring.factories b/components/camel-zipkin-starter/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index de0afda..0000000
--- a/components/camel-zipkin-starter/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.zipkin.starter.ZipkinAutoConfiguration
\ No newline at end of file