camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject git commit: CAMEL-7092: Cleanup
Date Sat, 08 Feb 2014 08:24:12 GMT
Updated Branches:
  refs/heads/master cbed0690f -> b26b6a429


CAMEL-7092: Cleanup


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

Branch: refs/heads/master
Commit: b26b6a4294d4b36f7eabc9b5f44f5e11c184931f
Parents: cbed069
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Feb 8 09:25:22 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Feb 8 09:25:22 2014 +0100

----------------------------------------------------------------------
 components/camel-kafka/pom.xml                  | 108 +++++-----
 .../camel/component/kafka/KafkaComponent.java   |   2 +-
 .../camel/component/kafka/KafkaConstants.java   |   2 +-
 .../camel/component/kafka/KafkaConsumer.java    |   9 +-
 .../camel/component/kafka/KafkaEndpoint.java    |  11 +-
 .../camel/component/kafka/KafkaProducer.java    |  10 +-
 .../src/main/resources/META-INF/LICENSE.txt     | 203 +++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt      |  11 +
 .../services/org/apache/camel/component/kafka   |  17 ++
 .../component/kafka/KafkaComponentTest.java     |   3 -
 .../camel/component/kafka/KafkaConsumerIT.java  |   8 +-
 .../component/kafka/KafkaConsumerTest.java      |  21 +-
 .../component/kafka/KafkaEndpointTest.java      |  13 --
 .../camel/component/kafka/KafkaProducerIT.java  |   8 +-
 .../component/kafka/KafkaProducerTest.java      |   3 -
 .../component/kafka/SimplePartitioner.java      |   3 -
 .../src/test/resources/log4j.properties         |  35 ++++
 .../camel-kafka/src/test/resources/log4j.xml    |  19 --
 18 files changed, 342 insertions(+), 144 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 0a443e4..b824254 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -17,62 +17,64 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>components</artifactId>
-        <version>2.13-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>components</artifactId>
+    <version>2.13-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>camel-kafka</artifactId>
-    <packaging>bundle</packaging>
-    <name>Camel :: Kafka</name>
-    <description>Camel kafka support</description>
+  <artifactId>camel-kafka</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: Kafka</name>
+  <description>Camel Kafka support</description>
 
-    <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.kafka.*</camel.osgi.export.pkg>
-        <camel.osgi.export.service>
-          org.apache.camel.spi.ComponentResolver;component=kafka,
-        </camel.osgi.export.service>
-    </properties>
+  <properties>
+    <camel.osgi.export.pkg>org.apache.camel.component.kafka.*</camel.osgi.export.pkg>
+    <camel.osgi.export.service>
+      org.apache.camel.spi.ComponentResolver;component=kafka,
+    </camel.osgi.export.service>
+  </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka_2.10</artifactId>
-            <version>${kafka-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scala-version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka_2.10</artifactId>
+      <version>${kafka-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>${scala-version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
index d3d4679..845f060 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
@@ -22,7 +22,7 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultComponent;
 
 /**
- * @author Stephen Samuel
+ *
  */
 public class KafkaComponent extends DefaultComponent {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConstants.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConstants.java
index 81a33f7..18f1da0 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConstants.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConstants.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.kafka;
 
 /**
- * @author Stephen Samuel
+ *
  */
 public final class KafkaConstants {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index b2c132b..8db7c54 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -34,9 +34,8 @@ import org.apache.camel.impl.DefaultConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
- * @author Stephen Samuel
+ *
  */
 public class KafkaConsumer extends DefaultConsumer {
 
@@ -100,7 +99,11 @@ public class KafkaConsumer extends DefaultConsumer {
             consumer.shutdown();
         }
         if (executor != null) {
-            executor.shutdown();
+            if (getEndpoint() != null && getEndpoint().getCamelContext() != null)
{
+                getEndpoint().getCamelContext().getExecutorServiceManager().shutdownNow(executor);
+            } else {
+                executor.shutdownNow();
+            }
         }
         executor = null;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
index 5552893..b700850 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
@@ -17,11 +17,9 @@
 package org.apache.camel.component.kafka;
 
 import java.net.URISyntaxException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.ExecutorService;
 
 import kafka.message.MessageAndMetadata;
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -31,9 +29,8 @@ import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.impl.DefaultMessage;
 
-
 /**
- * @author Stephen Samuel
+ *
  */
 public class KafkaEndpoint extends DefaultEndpoint {
 
@@ -136,8 +133,8 @@ public class KafkaEndpoint extends DefaultEndpoint {
         return true;
     }
 
-    public ThreadPoolExecutor createExecutor() {
-        return (ThreadPoolExecutor) Executors.newFixedThreadPool(getConsumerStreams());
+    public ExecutorService createExecutor() {
+        return getCamelContext().getExecutorServiceManager().newFixedThreadPool(this, "KafkaTopic["
+ getTopic() + "]", getConsumerStreams());
     }
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
index cfcc0a9..66440f3 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducer.java
@@ -23,20 +23,19 @@ import kafka.producer.KeyedMessage;
 import kafka.producer.ProducerConfig;
 
 import org.apache.camel.CamelException;
+import org.apache.camel.CamelExchangeException;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultProducer;
 
-
 /**
- * @author Stephen Samuel
+ *
  */
 public class KafkaProducer extends DefaultProducer {
 
     protected Producer<String, String> producer;
     private final KafkaEndpoint endpoint;
 
-    public KafkaProducer(KafkaEndpoint endpoint) throws ClassNotFoundException, IllegalAccessException,
-            InstantiationException {
+    public KafkaProducer(KafkaEndpoint endpoint) {
         super(endpoint);
         this.endpoint = endpoint;
     }
@@ -66,10 +65,9 @@ public class KafkaProducer extends DefaultProducer {
 
     @Override
     public void process(Exchange exchange) throws CamelException {
-
         Object partitionKey = exchange.getIn().getHeader(KafkaConstants.PARTITION_KEY);
         if (partitionKey == null) {
-            throw new CamelException("No partition key set");
+            throw new CamelExchangeException("No partition key set", exchange);
         }
         String msg = exchange.getIn().getBody(String.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/resources/META-INF/LICENSE.txt b/components/camel-kafka/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-kafka/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/resources/META-INF/NOTICE.txt b/components/camel-kafka/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-kafka/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/main/resources/META-INF/services/org/apache/camel/component/kafka
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/resources/META-INF/services/org/apache/camel/component/kafka
b/components/camel-kafka/src/main/resources/META-INF/services/org/apache/camel/component/kafka
index c0dc9d1..0e8f745 100644
--- a/components/camel-kafka/src/main/resources/META-INF/services/org/apache/camel/component/kafka
+++ b/components/camel-kafka/src/main/resources/META-INF/services/org/apache/camel/component/kafka
@@ -1 +1,18 @@
+#
+# 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.
+#
+
 class=org.apache.camel.component.kafka.KafkaComponent
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
index 466ddf5..c11edaf 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
@@ -25,9 +25,6 @@ import org.mockito.Mockito;
 
 import static org.junit.Assert.assertEquals;
 
-/**
- * @author Stephen Samuel
- */
 public class KafkaComponentTest {
 
     private CamelContext context = Mockito.mock(CamelContext.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerIT.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerIT.java
index cf862af..cb9be59 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerIT.java
@@ -32,13 +32,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-
 /**
- * @author Stephen Samuel
- *         <p/>
- *         <p/>
- *         The Producer IT tests require a Kafka broker running on 9092 and a zookeeper instance
running on 2181.
- *         The broker must have a topic called test created.
+ * The Producer IT tests require a Kafka broker running on 9092 and a zookeeper instance
running on 2181.
+ * The broker must have a topic called test created.
  */
 public class KafkaConsumerIT extends CamelTestSupport {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerTest.java
index 8fe11bc..740f116 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerTest.java
@@ -16,17 +16,12 @@
  */
 package org.apache.camel.component.kafka;
 
-import java.util.concurrent.ThreadPoolExecutor;
-
 import org.apache.camel.Processor;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
 
-/**
- * @author Stephen Samuel
- */
 public class KafkaConsumerTest {
 
     private KafkaEndpoint endpoint = mock(KafkaEndpoint.class);
@@ -44,18 +39,4 @@ public class KafkaConsumerTest {
         new KafkaConsumer(endpoint, processor);
     }
 
-    @Test
-    public void testStoppingConsumerShutsdownExecutor() throws Exception {
-
-        when(endpoint.getZookeeperHost()).thenReturn("localhost");
-        when(endpoint.getZookeeperPort()).thenReturn(2181);
-        when(endpoint.getGroupId()).thenReturn("12345");
-
-        KafkaConsumer consumer = new KafkaConsumer(endpoint, processor);
-
-        ThreadPoolExecutor e = mock(ThreadPoolExecutor.class);
-        consumer.executor = e;
-        consumer.doStop();
-        verify(e).shutdown();
-    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
index bda95a1..3a59e3e 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaEndpointTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.kafka;
 
 import java.net.URISyntaxException;
-import java.util.concurrent.ThreadPoolExecutor;
 
 import kafka.message.MessageAndMetadata;
 
@@ -27,10 +26,6 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-
-/**
- * @author Stephen Samuel
- */
 public class KafkaEndpointTest {
 
     @Test
@@ -47,14 +42,6 @@ public class KafkaEndpointTest {
     }
 
     @Test
-    public void creatingExecutorUsesThreadPoolSettings() throws Exception {
-        KafkaEndpoint endpoint = new KafkaEndpoint("kafka:localhost", "kafka:localhost",
new KafkaComponent());
-        endpoint.setConsumerStreams(44);
-        ThreadPoolExecutor executor = endpoint.createExecutor();
-        assertEquals(44, executor.getCorePoolSize());
-    }
-
-    @Test
     public void assertSingleton() throws URISyntaxException {
         KafkaEndpoint endpoint = new KafkaEndpoint("kafka:localhost", "localhost", new KafkaComponent());
         assertTrue(endpoint.isSingleton());

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerIT.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerIT.java
index c30dca2..5805666 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerIT.java
@@ -40,13 +40,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-
 /**
- * @author Stephen Samuel
- *         <p/>
- *         <p/>
- *         The Producer IT tests require a Kafka broker running on 9092 and a zookeeper instance
running on 2181.
- *         The broker must have a topic called test created.
+ * The Producer IT tests require a Kafka broker running on 9092 and a zookeeper instance
running on 2181.
+ * The broker must have a topic called test created.
  */
 public class KafkaProducerIT extends CamelTestSupport {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
index ba29c63..ccaaab5 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerTest.java
@@ -34,9 +34,6 @@ import org.mockito.Mockito;
 
 import static org.junit.Assert.assertEquals;
 
-/**
- * @author Stephen Samuel
- */
 public class KafkaProducerTest {
 
     private KafkaProducer producer;

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/SimplePartitioner.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/SimplePartitioner.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/SimplePartitioner.java
index a06b889..05eb1e5 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/SimplePartitioner.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/SimplePartitioner.java
@@ -19,9 +19,6 @@ package org.apache.camel.component.kafka;
 import kafka.producer.Partitioner;
 import kafka.utils.VerifiableProperties;
 
-/**
- * @author Stephen Samuel
- */
 public class SimplePartitioner implements Partitioner<String> {
 
     public SimplePartitioner(VerifiableProperties props) {

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/resources/log4j.properties b/components/camel-kafka/src/test/resources/log4j.properties
new file mode 100644
index 0000000..67458fd
--- /dev/null
+++ b/components/camel-kafka/src/test/resources/log4j.properties
@@ -0,0 +1,35 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=INFO, out
+
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.out.file=target/camel-kafka-test.log
+log4j.appender.out.append=true

http://git-wip-us.apache.org/repos/asf/camel/blob/b26b6a42/components/camel-kafka/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/resources/log4j.xml b/components/camel-kafka/src/test/resources/log4j.xml
deleted file mode 100644
index ff6e863..0000000
--- a/components/camel-kafka/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration threshold="all" debug="true" xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-    <appender name="console" class="org.apache.log4j.ConsoleAppender">
-        <param name="Target" value="System.out"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[%t] %-5p %c{1}.%M - %m%n"/>
-        </layout>
-    </appender>
-
-    <logger name="org.apache.camel.component.kafka">
-        <level value="debug"/>
-    </logger>
-    <root>
-        <level value="warn"/>
-        <appender-ref ref="console"/>
-    </root>
-
-</log4j:configuration>
\ No newline at end of file


Mime
View raw message