Moved to annotation-based plug-in declaration

assembly.xml

@@ -41,8 +41,6 @@
 			<outputDirectory>.</outputDirectory>
 			<includes>
 				<include>*.jar</include>
-				<include>logo.png</include>
-				<include>plugin.xml</include>
 				<include>version.xml</include>
 			</includes>
 		</fileSet>

src/main/java/com/ruckuswireless/pentaho/kafka/consumer/KafkaConsumerStep.java → src/main/java/org/pentaho/di/trans/kafka/consumer/KafkaConsumer.java

@@ -1,4 +1,4 @@
-package com.ruckuswireless.pentaho.kafka.consumer;
+package org.pentaho.di.trans.kafka.consumer;
 
 import java.util.HashMap;
 import java.util.List;
@@ -31,10 +31,10 @@
  *
  * @author Michael Spector
  */
-public class KafkaConsumerStep extends BaseStep implements StepInterface {
+public class KafkaConsumer extends BaseStep implements StepInterface {
 	public static final String CONSUMER_TIMEOUT_KEY = "consumer.timeout.ms";
 
-	public KafkaConsumerStep(StepMeta stepMeta, StepDataInterface stepDataInterface, int copyNr, TransMeta transMeta,
+	public KafkaConsumer(StepMeta stepMeta, StepDataInterface stepDataInterface, int copyNr, TransMeta transMeta,
 			Trans trans) {
 		super(stepMeta, stepDataInterface, copyNr, transMeta, trans);
 	}
@@ -58,12 +58,12 @@ public boolean init(StepMetaInterface smi, StepDataInterface sdi) {
 			}
 		} else {
 			if (substProperties.containsKey(CONSUMER_TIMEOUT_KEY)) {
-				logError(Messages.getString("KafkaConsumerStep.WarnConsumerTimeout"));
+				logError(Messages.getString("KafkaConsumer.WarnConsumerTimeout"));
 			}
 		}
 		ConsumerConfig consumerConfig = new ConsumerConfig(substProperties);
 
-		logBasic(Messages.getString("KafkaConsumerStep.CreateKafkaConsumer.Message", consumerConfig.zkConnect()));
+		logBasic(Messages.getString("KafkaConsumer.CreateKafkaConsumer.Message", consumerConfig.zkConnect()));
 		data.consumer = Consumer.createJavaConsumerConnector(consumerConfig);
 		Map<String, Integer> topicCountMap = new HashMap<String, Integer>();
 		String topic = environmentSubstitute(meta.getTopic());
@@ -137,7 +137,7 @@ protected void messageReceived(byte[] key, byte[] message) throws KettleExceptio
 					putRow(data.outputRowMeta, newRow);
 
 					if (isRowLevel()) {
-						logRowlevel(Messages.getString("KafkaConsumerStep.Log.OutputRow",
+						logRowlevel(Messages.getString("KafkaConsumer.Log.OutputRow",
 								Long.toString(getLinesWritten()), data.outputRowMeta.getString(newRow)));
 					}
 				}
@@ -162,7 +162,7 @@ protected void messageReceived(byte[] key, byte[] message) throws KettleExceptio
 			}
 		} catch (KettleException e) {
 			if (!getStepMeta().isDoingErrorHandling()) {
-				logError(Messages.getString("KafkaConsumerStep.ErrorInStepRunning", e.getMessage()));
+				logError(Messages.getString("KafkaConsumer.ErrorInStepRunning", e.getMessage()));
 				setErrors(1);
 				stopAll();
 				setOutputDone();

src/main/java/com/ruckuswireless/pentaho/kafka/consumer/KafkaConsumerCallable.java → src/main/java/org/pentaho/di/trans/kafka/consumer/KafkaConsumerCallable.java

@@ -1,4 +1,4 @@
-package com.ruckuswireless.pentaho.kafka.consumer;
+package org.pentaho.di.trans.kafka.consumer;
 
 import java.util.concurrent.Callable;
 
@@ -16,9 +16,9 @@ public abstract class KafkaConsumerCallable implements Callable<Object> {
 
 	private KafkaConsumerData data;
 	private KafkaConsumerMeta meta;
-	private KafkaConsumerStep step;
+	private KafkaConsumer step;
 
-	public KafkaConsumerCallable(KafkaConsumerMeta meta, KafkaConsumerData data, KafkaConsumerStep step) {
+	public KafkaConsumerCallable(KafkaConsumerMeta meta, KafkaConsumerData data, KafkaConsumer step) {
 		this.meta = meta;
 		this.data = data;
 		this.step = step;

src/main/java/com/ruckuswireless/pentaho/kafka/consumer/KafkaConsumerData.java → src/main/java/org/pentaho/di/trans/kafka/consumer/KafkaConsumerData.java

@@ -1,4 +1,4 @@
-package com.ruckuswireless.pentaho.kafka.consumer;
+package org.pentaho.di.trans.kafka.consumer;
 
 import kafka.consumer.ConsumerIterator;
 import kafka.javaapi.consumer.ConsumerConnector;

src/main/java/com/ruckuswireless/pentaho/kafka/consumer/KafkaConsumerMeta.java → src/main/java/org/pentaho/di/trans/kafka/consumer/KafkaConsumerMeta.java

@@ -1,4 +1,4 @@
-package com.ruckuswireless.pentaho.kafka.consumer;
+package org.pentaho.di.trans.kafka.consumer;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.Properties;
 
+import org.pentaho.di.core.annotations.Step;
 import org.pentaho.di.core.CheckResult;
 import org.pentaho.di.core.CheckResultInterface;
 import org.pentaho.di.core.Const;
@@ -39,6 +40,13 @@
  *
  * @author Michael Spector
  */
+@Step(
+		id = "KafkaConsumer",
+		image = "org/pentaho/di/trans/kafka/consumer/resources/kafka_consumer.png",
+		i18nPackageName="org.pentaho.di.trans.kafka.consumer",
+		name="KafkaConsumerDialog.Shell.Title",
+		description = "KafkaConsumerDialog.Shell.Tooltip",
+		categoryDescription="i18n:org.pentaho.di.trans.step:BaseStep.Category.Input")
 public class KafkaConsumerMeta extends BaseStepMeta implements StepMetaInterface {
 
 	public static final String[] KAFKA_PROPERTIES_NAMES = new String[] { "zookeeper.connect", "group.id", "consumer.id",
@@ -61,7 +69,7 @@ public class KafkaConsumerMeta extends BaseStepMeta implements StepMetaInterface
 	private String timeout;
 	private boolean stopOnEmptyTopic;
 
-	Properties getKafkaProperties() {
+	public Properties getKafkaProperties() {
 		return kafkaProperties;
 	}
 
@@ -181,7 +189,7 @@ public void check(List<CheckResultInterface> remarks, TransMeta transMeta, StepM
 
 	public StepInterface getStep(StepMeta stepMeta, StepDataInterface stepDataInterface, int cnr, TransMeta transMeta,
 			Trans trans) {
-		return new KafkaConsumerStep(stepMeta, stepDataInterface, cnr, transMeta, trans);
+		return new KafkaConsumer(stepMeta, stepDataInterface, cnr, transMeta, trans);
 	}
 
 	public StepDataInterface getStepData() {

src/main/java/com/ruckuswireless/pentaho/kafka/consumer/Messages.java → src/main/java/org/pentaho/di/trans/kafka/consumer/Messages.java

@@ -1,4 +1,4 @@
-package com.ruckuswireless.pentaho.kafka.consumer;
+package org.pentaho.di.trans.kafka.consumer;
 
 import org.pentaho.di.i18n.BaseMessages;
 
@@ -33,4 +33,4 @@ public static String getString(String key, String param1, String param2, String
 			String param5, String param6) {
 		return BaseMessages.getString(clazz, key, param1, param2, param3, param4, param5, param6);
 	}
-}
+}

src/main/java/com/ruckuswireless/pentaho/kafka/consumer/KafkaConsumerDialog.java → src/main/java/org/pentaho/di/ui/trans/kafka/consumer/KafkaConsumerDialog.java

@@ -1,4 +1,4 @@
-package com.ruckuswireless.pentaho.kafka.consumer;
+package org.pentaho.di.ui.trans.kafka.consumer;
 
 import java.util.Arrays;
 import java.util.Properties;
@@ -33,6 +33,9 @@
 import org.pentaho.di.ui.core.widget.TextVar;
 import org.pentaho.di.ui.trans.step.BaseStepDialog;
 
+import org.pentaho.di.trans.kafka.consumer.KafkaConsumerMeta;
+import org.pentaho.di.trans.kafka.consumer.Messages;
+
 /**
  * UI for the Kafka Consumer step
  *

src/main/resources/com/ruckuswireless/pentaho/kafka/consumer/messages/messages_en_US.properties → src/main/resources/org/pentaho/di/trans/kafka/consumer/messages/messages_en_US.properties

@@ -1,14 +1,15 @@
-KafkaConsumerStep.CreateKafkaConsumer.Message=Creating Kafka consumer listening on zookeeper\: {0}
-KafkaConsumerStep.Log.OutputRow=Outputting row {0} : {1}
-KafkaConsumerStep.ErrorInStepRunning=Error running step \: {0}
-KafkaConsumerStep.WarnConsumerTimeout=WARNING\! You have set a consumer timeout, but have not requested termination on an empty topic. This could lead to a transformation failure if the queue becomes empty!
+KafkaConsumer.CreateKafkaConsumer.Message=Creating Kafka consumer listening on zookeeper\: {0}
+KafkaConsumer.Log.OutputRow=Outputting row {0} : {1}
+KafkaConsumer.ErrorInStepRunning=Error running step \: {0}
+KafkaConsumer.WarnConsumerTimeout=WARNING\! You have set a consumer timeout, but have not requested termination on an empty topic. This could lead to a transformation failure if the queue becomes empty!
 KafkaConsumerMeta.Exception.loadXml=Unable to read step information from XML
 KafkaConsumerMeta.Exception.loadRep=Unexpected error reading step information from the repository
 KafkaConsumerMeta.Exception.saveRep=Unexpected error writing step information to the repository
 KafkaConsumerMeta.Check.InvalidTopic=Topic name must be set\!
 KafkaConsumerMeta.Check.InvalidField=Field name must be set\!
 KafkaConsumerMeta.Check.InvalidKeyField=Key field name must be set\!
 KafkaConsumerDialog.Shell.Title=Apache Kafka Consumer
+KafkaConsumerDialog.Shell.Tooltip=Read messages throug a specific topic from a Kafka stream
 KafkaConsumerDialog.StepName.Label=Step name
 KafkaConsumerDialog.TopicName.Label=Topic name
 KafkaConsumerDialog.FieldName.Label=Target message field name
@@ -18,4 +19,4 @@ KafkaConsumerDialog.Timeout.Label=Maximum duration of consumption (ms)
 KafkaConsumerDialog.StopOnEmpty.Label=Stop on empty topic
 KafkaConsumerDialog.TableView.Label=Kafka Properties
 KafkaConsumerDialog.TableView.NameCol.Label=Name
-KafkaConsumerDialog.TableView.ValueCol.Label=Value
+KafkaConsumerDialog.TableView.ValueCol.Label=Value