final tweaks, added images

git-svn-id: svn://source.pentaho.org/svnkettleroot/Kettle/trunk@3645 5fb7f6ec-07c1-534a-b4ca-9155e429e800

.classpath

@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test/java"/>
-	<classpathentry kind="src" path="experimental"/>
-	<classpathentry kind="src" path="experimental_test"/>
+	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="libext/CacheDB.jar"/>
 	<classpathentry kind="lib" path="libext/js.jar"/>
 	<classpathentry kind="lib" path="libext/jxl.jar"/>
 	<classpathentry kind="lib" path="libext/mail.jar"/>
 	<classpathentry kind="lib" path="libext/log4j-1.2.8.jar"/>
 	<classpathentry kind="lib" path="libext/javadbf.jar"/>
-	<classpathentry kind="src" path="extra"/>
 	<classpathentry kind="lib" path="libext/jsch-0.1.24.jar"/>
-	<classpathentry kind="src" output="testClasses" path="test/useCases/replay"/>
-	<classpathentry kind="lib" path="test/libext/junit.jar"/>
 	<classpathentry kind="lib" path="libext/jackcess-1.1.5.jar" sourcepath="/Jackcess-1.1.5"/>
 	<classpathentry kind="lib" path="libswt/jface.jar"/>
 	<classpathentry kind="lib" path="libswt/runtime.jar"/>
@@ -73,5 +68,8 @@
 	<classpathentry kind="lib" path="libext/jaxp-ri.jar"/>
 	<classpathentry kind="lib" path="libext/ldapjdk.jar"/>
 	<classpathentry kind="lib" path="libext/JDBC/derby.jar"/>
+	<classpathentry kind="src" path="extra"/>
+	<classpathentry kind="lib" path="OLD_TEST/libext/junit.jar"/>
+	<classpathentry kind="lib" path="test/libext/kettle.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

Translator.bat

@@ -22,7 +22,7 @@ set CLASSPATH=.
 REM ******************
 REM   KETTLE Library
 REM ******************
-set CLASSPATH=%CLASSPATH%;lib\kettle.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle3.jar
 
 REM **********************
 REM   External Libraries

autobuild.sh

@@ -21,10 +21,10 @@ then
   ant zip
 
   #
-  # upload kettle.jar to Kettle.be
+  # upload kettle3.jar to Kettle.be
   #
   cd lib
-  ftp -u ftp://www.kettle.be:*******@www.kettle.be/dloads/ kettle.jar
+  ftp -u ftp://www.kettle.be:*******@www.kettle.be/dloads/ kettle3.jar
 
 else
   echo "Nothing was updated"

bin/Carte.bat

@@ -17,7 +17,7 @@ REM ******************
 REM   KETTLE Library
 REM ******************
 
-set CLASSPATH=%CLASSPATH%;lib\kettle.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle3.jar
 
 REM **********************
 REM   External Libraries

bin/Kitchen.bat

@@ -24,7 +24,7 @@ REM ******************
 REM   KETTLE Library
 REM ******************
 
-set CLASSPATH=%CLASSPATH%;lib\kettle.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle3.jar
 
 REM **********************
 REM   External Libraries

bin/Pan.bat

@@ -17,7 +17,7 @@ REM ******************
 REM   KETTLE Library
 REM ******************
 
-set CLASSPATH=%CLASSPATH%;lib\kettle.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle3.jar
 
 REM **********************
 REM   External Libraries

bin/Spoon.bat

@@ -22,7 +22,7 @@ set CLASSPATH=.
 REM ******************
 REM   KETTLE Library
 REM ******************
-set CLASSPATH=%CLASSPATH%;lib\kettle.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle3.jar
 
 REM **********************
 REM   External Libraries

bin/carte.sh

@@ -9,7 +9,7 @@ if [ -z "$KETTLE_HOME" ]; then
   BASEDIR=$(dirname $0)
 fi
 CLASSPATH=$BASEDIR
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle3.jar
 
 # **************************************************
 # ** JDBC & other libraries used by Kettle:       **

bin/generateClusterSchema.sh

@@ -6,7 +6,7 @@
 
 BASEDIR=$(dirname $0)
 CLASSPATH=$BASEDIR
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle3.jar
 
 # **************************************************
 # ** JDBC & other libraries used by Kettle:       **

bin/kitchen.sh

@@ -6,7 +6,7 @@
 
 BASEDIR=$(dirname $0)
 CLASSPATH=$BASEDIR
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle3.jar
 
 # **************************************************
 # ** JDBC & other libraries used by Kettle:       **

bin/pan.sh

@@ -9,7 +9,7 @@ if [ -z "$KETTLE_HOME" ]; then
   BASEDIR=$(dirname $0)
 fi
 CLASSPATH=$BASEDIR
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle3.jar
 
 # **************************************************
 # ** JDBC & other libraries used by Kettle:       **

bin/spoon.sh

@@ -21,7 +21,7 @@ if [ -z "$KETTLE_HOME" ]; then
   BASEDIR=$(dirname $0)
 fi
 CLASSPATH=$BASEDIR
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle3.jar
 CLASSPATH=$CLASSPATH:$BASEDIR/libswt/jface.jar
 CLASSPATH=$CLASSPATH:$BASEDIR/libswt/runtime.jar
 CLASSPATH=$CLASSPATH:$BASEDIR/libswt/common.jar

build.xml

@@ -88,7 +88,7 @@
 
 		<target name="revision" depends="compile" description="compile the source " >
 	 	  <echo>Bumping revision...</echo>
-	  	  <java classname="be.ibridge.kettle.version.UpdateBuildVersion"
+	  	  <java classname="org.pentaho.di.version.UpdateBuildVersion"
 		  	    classpath="${classes}"
 	  	  	  />
 		 <!-- <concat><filelist dir="." files="build_version.txt"/></concat> -->
@@ -110,7 +110,7 @@
 		    	>
 
 		    	<classpath id="cp-kettle-test">
-		    		<fileset dir="${lib}" 	  		includes="kettle.jar"/>
+		    		<fileset dir="${lib}" 	  		includes="kettle3.jar"/>
 		    		<fileset dir="${testlibext}" 	includes="*.jar"/>
 			  	</classpath>
 		    </javac>
@@ -156,7 +156,7 @@
         	maxmemory="256M"
         	nodeprecatedlist="false" 
         	nodeprecated="false" 
-        	packagenames ="be.ibridge.kettle.*" 
+        	packagenames ="org.pentaho.di.*" 
         	sourcepath="${src}" 
         	doctitle="Kettle API documentation">
             <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
@@ -182,12 +182,12 @@
 	       ==========================
 	  -->
 
-	  <target name="kettle" depends="compile, revision, copy" description="generate the kettle library kettle.jar">
-	  	<echo>Generating the Kettle library kettle.jar ...</echo>
-	  	<jar jarfile="${lib}/kettle.jar" 
+	  <target name="kettle" depends="compile, revision, copy" description="generate the kettle library kettle3.jar">
+	  	<echo>Generating the Kettle library kettle3.jar ...</echo>
+	  	<jar jarfile="${lib}/kettle3.jar" 
 	    	 basedir="${classes}" 
 	    	 includes="**/* ../build_version.txt"
-	  	     excludes="**/Thumbs.db be/ibridge/kettle/schema/**/* be/ibridge/kettle/menu/**/*"
+	  	     excludes="**/Thumbs.db"
 	  		/>
 
 
@@ -209,7 +209,7 @@
 
 	  		<!-- base lib -->
 	  		<mkdir dir="${distrib}/lib"/>
-	  		<copy todir="${distrib}/lib"  file="${lib}/kettle.jar"/>
+	  		<copy todir="${distrib}/lib"  file="${lib}/kettle3.jar"/>
 
   	        <!-- external libs (jdbc etc) -->
 	  		<mkdir dir="${distrib}/libext"/>

extra/TransBuilder.bat

@@ -18,7 +18,7 @@ set CLASSPATH=.
 REM ******************
 REM   KETTLE Library
 REM ******************
-set CLASSPATH=%CLASSPATH%;%BASEDIR%\lib\kettle.jar
+set CLASSPATH=%CLASSPATH%;%BASEDIR%\lib\kettle3.jar
 
 REM **********************
 REM   External Libraries

extra/TransBuilder.java

@@ -3,22 +3,24 @@
 import java.io.File;
 import java.io.FileOutputStream;
 
-import be.ibridge.kettle.core.Const;
-import be.ibridge.kettle.core.LogWriter;
-import be.ibridge.kettle.core.NotePadMeta;
-import be.ibridge.kettle.core.database.Database;
-import be.ibridge.kettle.core.database.DatabaseMeta;
-import be.ibridge.kettle.core.exception.KettleException;
-import be.ibridge.kettle.core.util.EnvUtil;
-import be.ibridge.kettle.trans.StepLoader;
-import be.ibridge.kettle.trans.Trans;
-import be.ibridge.kettle.trans.TransHopMeta;
-import be.ibridge.kettle.trans.TransMeta;
-import be.ibridge.kettle.trans.step.StepMeta;
-import be.ibridge.kettle.trans.step.StepMetaInterface;
-import be.ibridge.kettle.trans.step.selectvalues.SelectValuesMeta;
-import be.ibridge.kettle.trans.step.tableinput.TableInputMeta;
-import be.ibridge.kettle.trans.step.tableoutput.TableOutputMeta;
+import org.pentaho.di.core.Const;
+import org.pentaho.di.core.NotePadMeta;
+import org.pentaho.di.core.database.Database;
+import org.pentaho.di.core.database.DatabaseMeta;
+import org.pentaho.di.core.exception.KettleException;
+import org.pentaho.di.core.logging.LogWriter;
+import org.pentaho.di.core.util.EnvUtil;
+import org.pentaho.di.trans.StepLoader;
+import org.pentaho.di.trans.Trans;
+import org.pentaho.di.trans.TransHopMeta;
+import org.pentaho.di.trans.TransMeta;
+import org.pentaho.di.trans.step.StepMeta;
+import org.pentaho.di.trans.step.StepMetaInterface;
+import org.pentaho.di.trans.steps.selectvalues.SelectValuesMeta;
+import org.pentaho.di.trans.steps.tableinput.TableInputMeta;
+import org.pentaho.di.trans.steps.tableoutput.TableOutputMeta;
+
+
 
 /**
  * Class created to demonstrate the creation of transformations on-the-fly.

src/org/pentaho/di/chef/ChefHistory.java

@@ -58,7 +58,7 @@
  * The idea is that this Composite is only populated when after loading of a job, we find a connection and logging table.
  * We then read from this table and populate the grid and log.
  *  
- * @see be.ibridge.kettle.chef.Chef
+ * @see Chef
  * @author Matt
  * @since  16-mar-2006
  */

src/org/pentaho/di/compatibility/Row.java

@@ -46,7 +46,7 @@
  *
  * @author Matt
  * @since Beginning 2003.
- * @see be.ibridge.kettle.core.value.Value
+ * @see Value
  *
  */
 public class Row implements XMLInterface, Comparable, Serializable

src/org/pentaho/di/core/Const.java

@@ -117,7 +117,7 @@ public class Const
 	/**
 	 * The images directory
 	 */
-	public static final String IMAGE_DIRECTORY = "/be/ibridge/kettle/images/"; //+FILE_SEPARATOR;
+	public static final String IMAGE_DIRECTORY = "/org/pentaho/di/images/"; //+FILE_SEPARATOR;
 
 	/**
 	 *  Public directory containing external steps plugins

src/org/pentaho/di/core/database/AS400DatabaseMeta.java

@@ -188,7 +188,7 @@ public String getFieldDefinition(ValueMetaInterface v, String tk, String pk, boo
 	}
 
 	/* (non-Javadoc)
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getReservedWords()
+	 * @see DatabaseInterface#getReservedWords()
 	 */
 	public String[] getReservedWords()
 	{

src/org/pentaho/di/core/database/DB2DatabaseMeta.java

@@ -244,7 +244,7 @@ public String getFieldDefinition(ValueMetaInterface v, String tk, String pk, boo
 	}
 
 	/* (non-Javadoc)
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getReservedWords()
+	 * @see DatabaseInterface#getReservedWords()
 	 */
 	public String[] getReservedWords()
 	{

src/org/pentaho/di/core/database/DbaseDatabaseMeta.java

@@ -50,7 +50,7 @@ public int[] getAccessTypeList()
 	}
 
 	/**
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getNotFoundTK(boolean)
+	 * @see DatabaseInterface#getNotFoundTK(boolean)
 	 */
 	public int getNotFoundTK(boolean use_autoinc)
 	{
@@ -81,7 +81,7 @@ public boolean isFetchSizeSupported()
 	}
 
 	/**
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getSchemaTableCombination(java.lang.String, java.lang.String)
+	 * @see DatabaseInterface#getSchemaTableCombination(java.lang.String, java.lang.String)
 	 */
 	public String getSchemaTableCombination(String schema_name, String table_part)
 	{

src/org/pentaho/di/core/database/DerbyDatabaseMeta.java

@@ -50,7 +50,7 @@ public int[] getAccessTypeList()
 	}
 
 	/**
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getNotFoundTK(boolean)
+	 * @see DatabaseInterface#getNotFoundTK(boolean)
 	 */
 	public int getNotFoundTK(boolean use_autoinc)
 	{

src/org/pentaho/di/core/database/ExtenDBDatabaseMeta.java

@@ -56,7 +56,7 @@ public int getDatabaseType()
     }
 
     /**
-     * @see be.ibridge.kettle.core.database.DatabaseInterface#getAccessTypeList()
+     * @see DatabaseInterface#getAccessTypeList()
      */
     public int[] getAccessTypeList()
     {
@@ -70,7 +70,7 @@ public int getDefaultDatabasePort()
     }
 
     /**
-     * @see be.ibridge.kettle.core.database.DatabaseInterface#getDriverClass()
+     * @see DatabaseInterface#getDriverClass()
      */
     public String getDriverClass()
     {
@@ -179,7 +179,7 @@ public String getModifyColumnStatement(String tablename, ValueMetaInterface v, S
 
 
     /**
-     * @see be.ibridge.kettle.core.database.DatabaseInterface#getFieldDefinition(be.ibridge.kettle.core.value.Value, java.lang.String, java.lang.String, boolean, boolean, boolean)
+     * @see DatabaseInterface#getFieldDefinition(Value, String, String, boolean, boolean, boolean)
      */
     public String getFieldDefinition(ValueMetaInterface v, String tk, String pk, boolean use_autoinc, boolean add_fieldname, boolean add_cr)
     {

src/org/pentaho/di/core/database/FirebirdDatabaseMeta.java

@@ -315,7 +315,7 @@ public String getFieldDefinition(ValueMetaInterface v, String tk, String pk, boo
 	}
 
 	/* (non-Javadoc)
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getSQLListOfProcedures()
+	 * @see DatabaseInterface#getSQLListOfProcedures()
 	 */
 	public String getSQLListOfProcedures()
 	{

src/org/pentaho/di/core/database/GenericDatabaseMeta.java

@@ -54,7 +54,7 @@ public int[] getAccessTypeList()
 	}
 
 	/**
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getNotFoundTK(boolean)
+	 * @see DatabaseInterface#getNotFoundTK(boolean)
 	 */
 	public int getNotFoundTK(boolean use_autoinc)
 	{

src/org/pentaho/di/core/database/H2DatabaseMeta.java

@@ -50,7 +50,7 @@ public int[] getAccessTypeList()
 	}
 
 	/**
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getNotFoundTK(boolean)
+	 * @see DatabaseInterface#getNotFoundTK(boolean)
 	 */
 	public int getNotFoundTK(boolean use_autoinc)
 	{
@@ -92,7 +92,7 @@ public boolean isFetchSizeSupported()
 	}
 
 	/**
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getSchemaTableCombination(java.lang.String, java.lang.String)
+	 * @see DatabaseInterface#getSchemaTableCombination(java.lang.String, java.lang.String)
 	 */
 	public String getSchemaTableCombination(String schema_name, String table_part)
 	{

src/org/pentaho/di/core/database/InformixDatabaseMeta.java

@@ -56,7 +56,7 @@ public int getDefaultDatabasePort()
 	}
 
 	/**
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getNotFoundTK(boolean)
+	 * @see DatabaseInterface#getNotFoundTK(boolean)
 	 */
 	public int getNotFoundTK(boolean use_autoinc)
 	{

src/org/pentaho/di/core/database/IngresDatabaseMeta.java

@@ -83,7 +83,7 @@ public String getURL(String hostname, String port, String databaseName)
 	}
 
 	/**
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getSchemaTableCombination(java.lang.String, java.lang.String)
+	 * @see DatabaseInterface#getSchemaTableCombination(java.lang.String, java.lang.String)
 	 */
 	public String getSchemaTableCombination(String schema_name, String table_part)
 	{
@@ -237,7 +237,7 @@ public String getFieldDefinition(ValueMetaInterface v, String tk, String pk, boo
 	}
 
 	/* (non-Javadoc)
-	 * @see be.ibridge.kettle.core.database.DatabaseInterface#getSQLListOfProcedures()
+	 * @see DatabaseInterface#getSQLListOfProcedures()
 	 */
 	public String getSQLListOfProcedures()
 	{