SVN: merge--reintegratebranches/issue-clo-1475 to trunk-4-0

git-svn-id: https://svn.javlin.eu/svn/cloveretl.opensource/trunk-4-0@15633 a09ad3ba-1a0f-0410-b1b9-c67202f10d70

cloveretl.bulkloader/src/org/jetel/component/DB2DataWriter.java

@@ -1782,11 +1782,6 @@ public static Node fromXML(TransformationGraph graph, Element xmlElement) throws
         return writer;
     }
 
-	@Override
-	public String getType() {
-		return COMPONENT_TYPE;
-	}
-
 	public char getColumnDelimiter() {
 		return columnDelimiter;
 	}

cloveretl.bulkloader/src/org/jetel/component/InfobrightDataWriter.java

@@ -580,11 +580,6 @@ public void rollback() {
 		logger.warn(this.getId() + " finished with error. The current transaction has been rolled back.");
 	}
 
-	@Override
-	public String getType() {
-		return COMPONENT_TYPE;
-	}
-
     public static Node fromXML(TransformationGraph graph, Element xmlElement) throws XMLConfigurationException, AttributeNotFoundException {
 		ComponentXMLAttributes xattribs = new ComponentXMLAttributes(xmlElement, graph);
         InfobrightDataWriter loader;

cloveretl.bulkloader/src/org/jetel/component/InformixDataWriter.java

@@ -755,11 +755,6 @@ public ConfigurationStatus checkConfig(ConfigurationStatus status) {
         return status;
     }
 
-    @Override
-	public String getType(){
-        return COMPONENT_TYPE;
-    }
-
     private void setCommand(String command) {
 		this.command = command;
 	}

cloveretl.bulkloader/src/org/jetel/component/MsSqlDataWriter.java

@@ -1121,11 +1121,6 @@ public ConfigurationStatus checkConfig(ConfigurationStatus status) {
 		return status;
 	}
 
-	@Override
-	public String getType() {
-		return COMPONENT_TYPE;
-	}
-
 	private void setOwner(String owner) {
 		this.owner = owner;
 	}

cloveretl.bulkloader/src/org/jetel/component/MysqlDataWriter.java

@@ -1003,11 +1003,6 @@ public ConfigurationStatus checkConfig(ConfigurationStatus status) {
 		return status;
 	}
 
-	@Override
-	public String getType() {
-		return COMPONENT_TYPE;
-	}
-
     public void setLockTable(boolean lockTable) {
         this.lockTable = lockTable;
     }

cloveretl.bulkloader/src/org/jetel/component/OracleDataWriter.java

@@ -732,11 +732,6 @@ public ConfigurationStatus checkConfig(ConfigurationStatus status) {
         return status;
     }
 
-    @Override
-	public String getType(){
-        return COMPONENT_TYPE;
-    }
-
     public Append getAppend() {
         return append;
     }

cloveretl.bulkloader/src/org/jetel/component/PostgreSqlDataWriter.java

@@ -633,11 +633,6 @@ public ConfigurationStatus checkConfig(ConfigurationStatus status) {
 		return status;
 	}
 
-	@Override
-	public String getType() {
-		return COMPONENT_TYPE;
-	}
-
 	public void setCommandURL(String commandURL) {
 		this.commandURL = commandURL;
 	}

cloveretl.component.hadoop/plugin.xml

@@ -22,13 +22,56 @@
 	</extension>
 
 	<extension point-id="component">
-		<parameter id="className" value="org.jetel.hadoop.component.HadoopWriter"/>
-		<parameter id="type" value="HADOOP_WRITER"/>
+	  <ETLComponent category="writers" iconPath="icons/writers/HDFSWriter" name="HadoopWriter" type="HADOOP_WRITER" viewPlainData="false" viewGridData="false" className="org.jetel.hadoop.component.HadoopWriter">
+	    <shortDescription>Writes Hadoop/HDFS Sequence Files.</shortDescription>
+	    <description>Writes key-value sequences to Hadoop/HDFS Sequence File; copies key &amp; value from fields of input data records writes them to HDFS.</description>
+	    <outputPorts>
+	    </outputPorts>
+	    <inputPorts>
+	      <singlePort name="0" required="true"/>
+	    </inputPorts>
+	    <properties>
+	      <property category="basic" displayName="Hadoop connection" modifiable="true" name="connectionId" nullable="false" required="true">
+	        <singleType name="hadoopConnection"/>
+	      </property>
+	     <property category="basic" displayName="File URL" modifiable="true" name="fileURL" nullable="true" required="true">
+	        <singleType name="file" fields="input" dictionary="input" selectionMode="file_only"/>
+	      </property>
+	      <property category="basic" displayName="Key field" modifiable="true" name="keyField" nullable="true" required="true">
+	        <singleType name="field" inputPortName="0" />
+	      </property>
+	      <property category="basic" displayName="Value field" modifiable="true" name="valueField" nullable="true" required="true">
+	        <singleType name="field" inputPortName="0" />
+	      </property>
+	    </properties>
+	  </ETLComponent>
 	</extension>
 
 	<extension point-id="component">
-		<parameter id="className" value="org.jetel.hadoop.component.HadoopReader"/>
-		<parameter id="type" value="HADOOP_READER"/>
+	  <ETLComponent category="readers" iconPath="icons/readers/HDFSReader" name="HadoopReader" type="HADOOP_READER" viewPlainData="false" className="org.jetel.hadoop.component.HadoopReader">
+	    <shortDescription>Reads Hadoop/HDFS Sequence Files.</shortDescription>
+	    <description>Reads key-value sequences from Hadoop/HDFS Sequence File; copies key &amp; value on to output data fields and sends the record to the first output port.</description>
+	    <inputPorts>
+	      <singlePort name="0" required="false"/>
+	    </inputPorts>
+	    <outputPorts>
+	      <singlePort name="0" required="true" />
+	    </outputPorts>
+	    <properties>
+	      <property category="basic" displayName="Hadoop connection" modifiable="true" name="connectionId" nullable="false" required="true">
+	        <singleType name="hadoopConnection"/>
+	      </property>
+	      <property category="basic" displayName="File URL" modifiable="true" name="fileURL" nullable="true" required="true">
+	        <singleType name="file" fields="input" dictionary="input" selectionMode="file_only"/>
+	      </property>
+	      <property category="basic" displayName="Key field" modifiable="true" name="keyField" nullable="true" required="true">
+	        <singleType name="field" outputPortName="0" />
+	      </property>
+	      <property category="basic" displayName="Value field" modifiable="true" name="valueField" nullable="true" required="true">
+	        <singleType name="field" outputPortName="0" />
+	      </property>
+	    </properties>
+	  </ETLComponent>
 	</extension>
 
 	<extension point-id="urlResolver">

cloveretl.component.hadoop/src/org/jetel/hadoop/component/HadoopReader.java

@@ -395,11 +395,6 @@ static void checkConnectionIDs(String hadConnId, HadoopConnection usedHadConn, I
 		}
 	}
 
-	@Override
-	public String getType() {
-		return COMPONENT_TYPE;
-	}
-
 	/**
 	 * @param skipRows
 	 *            The skipRows to set.

cloveretl.component.hadoop/src/org/jetel/hadoop/component/HadoopWriter.java

@@ -112,11 +112,6 @@ public HadoopWriter(String id, String fileURL, String keyField, String valueFiel
 		this.valueField = valueField;
 	}
 
-	@Override
-	public String getType() {
-		return COMPONENT_TYPE;
-	}
-
 	@Override
 	public void preExecute() throws ComponentNotReadyException {
 		super.preExecute();

cloveretl.component/.classpath

@@ -16,6 +16,5 @@
 	<classpathentry kind="lib" path="lib/saxon9.jar"/>
 	<classpathentry kind="lib" path="lib/saxon9-dom.jar"/>
 	<classpathentry kind="lib" path="lib/jdbm-2.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>