PDI-841 : Split off kettle-core and kettle-db source code for better …

…re-use oppertunities git-svn-id: svn://source.pentaho.org/svnkettleroot/Kettle/trunk@6759 5fb7f6ec-07c1-534a-b4ca-9155e429e800
kiana · Feb 29, 2008 · 400e99d · 400e99d
1 parent 44d4648
commit 400e99d
Show file tree

Hide file tree

Showing 256 changed files with 809 additions and 1,987 deletions.
diff --git a/.classpath b/.classpath
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-ui"/>
+	<classpathentry kind="src" output="classes-ui" path="src-ui"/>
 	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="src" output="classes-core" path="src-core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<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="lib" path="libext/javadbf.jar" sourcepath="/javadbf/javadbf"/>
 	<classpathentry kind="lib" path="libext/jsch-0.1.24.jar"/>
 	<classpathentry kind="lib" path="libswt/jface.jar"/>
 	<classpathentry kind="lib" path="libswt/runtime.jar"/>

diff --git a/Translator.bat b/Translator.bat
@@ -9,8 +9,9 @@ set CLASSPATH=.
 REM ******************
 REM   KETTLE Library
 REM ******************
-set CLASSPATH=%CLASSPATH%;lib\kettle-engine-3.0.jar
-set CLASSPATH=%CLASSPATH%;lib\kettle-ui-swt-3.0.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-core.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-engine.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-ui-swt.jar
 
 REM *****************
 REM   SWT Libraries

diff --git a/bin/Carte.bat b/bin/Carte.bat
@@ -17,7 +17,8 @@ REM ******************
 REM   KETTLE Library
 REM ******************
 
-set CLASSPATH=%CLASSPATH%;lib\kettle-engine-3.0.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-core.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-engine.jar
 
 REM **********************
 REM   External Libraries

diff --git a/bin/Kitchen.bat b/bin/Kitchen.bat
@@ -24,7 +24,8 @@ REM ******************
 REM   KETTLE Library
 REM ******************
 
-set CLASSPATH=%CLASSPATH%;lib\kettle-engine-3.0.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-core.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-engine.jar
 
 REM **********************
 REM   External Libraries

diff --git a/bin/Pan.bat b/bin/Pan.bat
@@ -17,7 +17,8 @@ REM ******************
 REM   KETTLE Library
 REM ******************
 
-set CLASSPATH=%CLASSPATH%;lib\kettle-engine-3.0.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-core.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-engine.jar
 
 REM **********************
 REM   External Libraries

diff --git a/bin/Spoon.bat b/bin/Spoon.bat
@@ -34,8 +34,10 @@ set CLASSPATH=.
 REM ******************
 REM   KETTLE Library
 REM ******************
-set CLASSPATH=%CLASSPATH%;lib\kettle-engine-3.0.jar
-set CLASSPATH=%CLASSPATH%;lib\kettle-ui-swt-3.0.jar
+
+set CLASSPATH=%CLASSPATH%;lib\kettle-core.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-engine.jar
+set CLASSPATH=%CLASSPATH%;lib\kettle-ui-swt.jar
 
 REM **********************
 REM   External Libraries

diff --git a/bin/carte.sh b/bin/carte.sh
@@ -8,7 +8,8 @@ BASEDIR=$(dirname $0)
 cd $BASEDIR
 
 CLASSPATH=$BASEDIR
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine-3.0.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-core.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine.jar
 
 # **************************************************
 # ** JDBC & other libraries used by Kettle:       **

diff --git a/bin/generateClusterSchema.sh b/bin/generateClusterSchema.sh
@@ -8,7 +8,8 @@ BASEDIR=$(dirname $0)
 cd $BASEDIR
 
 CLASSPATH=$BASEDIR
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine-3.0.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-core.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine.jar
 
 # **************************************************
 # ** JDBC & other libraries used by Kettle:       **

diff --git a/bin/kitchen.sh b/bin/kitchen.sh
@@ -8,7 +8,8 @@ BASEDIR=$(dirname $0)
 cd $BASEDIR
 
 CLASSPATH=$BASEDIR
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine-3.0.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-core.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine.jar
 
 # **************************************************
 # ** JDBC & other libraries used by Kettle:       **

diff --git a/bin/pan.sh b/bin/pan.sh
@@ -8,7 +8,8 @@ BASEDIR=$(dirname $0)
 cd $BASEDIR
 
 CLASSPATH=$BASEDIR
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine-3.0.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-core.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine.jar
 
 # **************************************************
 # ** JDBC & other libraries used by Kettle:       **

diff --git a/bin/spoon.sh b/bin/spoon.sh
@@ -20,8 +20,11 @@ BASEDIR=$(dirname $0)
 cd $BASEDIR
 
 CLASSPATH=$BASEDIR
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine-3.0.jar
-CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-ui-swt-3.0.jar
+
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-core.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-engine.jar
+CLASSPATH=$CLASSPATH:$BASEDIR/lib/kettle-ui-swt.jar
+
 CLASSPATH=$CLASSPATH:$BASEDIR/libswt/jface.jar
 CLASSPATH=$CLASSPATH:$BASEDIR/libswt/runtime.jar
 CLASSPATH=$CLASSPATH:$BASEDIR/libswt/common.jar

diff --git a/build.properties b/build.properties
@@ -5,9 +5,11 @@ version=3.1.0-M1
 #Global Properties
 src=src
 src-ui=src-ui
+src-core=src-core
 test=test
 classes=classes
 classes-ui=classes-ui
+classes-core=classes-core
 testClasses=testClasses
 bin=bin
 build=build

diff --git a/build.xml b/build.xml
@@ -26,6 +26,7 @@
 	    <mkdir dir="${classes}/META-INF"/>
 	    <mkdir dir="${classes-ui}"/>
 	    <mkdir dir="${classes-ui}/ui"/>
+	    <mkdir dir="${classes-core}"/>
 	  	<mkdir dir="${testClasses}"/>
 	    <mkdir dir="${lib}"/>
 		<mkdir dir="${distrib}"/>
@@ -44,8 +45,27 @@
 	            Compile the code
 	       ==========================
 	  -->
+
+	  <target name="compile-core" depends="init" description="compile the core source code " >
+	  	<echo>Compiling Kettle CORE...</echo>
+	    <javac 
+	    	   destdir="${classes-core}"
+	    	   target="5"
+	    	   source="5"
+	           deprecation="true"
+	    	   debug="${debug}"
+             optimize="${optimize}"
+	    	>
+	    	<src path="${src-core}"/>
+
+	    	<classpath id="cp-kettle-core">
+				<fileset dir="${libext}" 		includes="*.jar *.zip"/>
+				<fileset dir="${libext}/"	    includes="**/*.jar *.zip"/>
+		  		</classpath>
+	    </javac>
+	  </target>
 
-	  <target name="compile" depends="init" description="compile the source " >
+	  <target name="compile" depends="compile-core" description="compile the source " >
 	  	<echo>Compiling Kettle...</echo>
 	    <javac 
 	    	   destdir="${classes}"
@@ -58,9 +78,9 @@
 	    	<src path="${src}"/>
 
 	    	<classpath id="cp-kettle">
+				<fileset dir="${lib}" 			includes="kettle-core.jar"/>
 				<fileset dir="${libext}" 		includes="*.jar *.zip"/>
 				<fileset dir="${libext}/"	    includes="**/*.jar *.zip"/>
-				<fileset dir="${libswt}" 		includes="common.jar"/>
 		  		</classpath>
 	    </javac>
 	  </target>
@@ -81,7 +101,8 @@
 	    	<src path="${src-ui}"/>
 
 	    	<classpath id="cp-kettle-ui">
-				<fileset dir="${lib}" 			includes="kettle-engine-3.0.jar"/>
+				<fileset dir="${lib}" 			includes="kettle-core.jar"/>
+				<fileset dir="${lib}" 			includes="kettle-engine.jar"/>
 				<fileset dir="${libext}" 		includes="*.jar *.zip"/>
 				<fileset dir="${libext}/"	    includes="**/*.jar *.zip"/>
 				<fileset dir="${libswt}" 		includes="*.jar *.zip"/>
@@ -127,7 +148,7 @@
 		    	>
 
 		    	<classpath id="cp-kettle-test">
-		    		<fileset dir="${lib}" 	  		includes="kettle-engine-3.0.jar"/>
+		    		<fileset dir="${lib}" 	  		includes="kettle-engine.jar"/>
 		    		<fileset dir="${testlibext}" 	includes="*.jar"/>
 		    		<fileset dir="${libext}/commons" 	includes="*.jar"/>
 		    		<fileset dir="${libext}" 	    includes="log4j-1.2.8.jar"/>
@@ -141,6 +162,13 @@
 	          Copy additional files
 	       ==========================
 	  -->
+
+	  <target name="copy-core" depends="compile-core" description="copy images etc from the core source to classes directory" >
+	  	<echo>Copying core images etc to classes directory...</echo>
+	    <copy todir="${classes-core}">
+	    	<fileset dir="${src-core}" includes="**/*.xml **/*properties"/>
+	  	    </copy>
+	  </target>
 
 	  <target name="copy" depends="compile" description="copy images etc to classes directory" >
 	  	<echo>Copying images etc to classes directory...</echo>
@@ -204,29 +232,44 @@
 	             Kettle library
 	       ==========================
 	  -->
+
+	  <target name="kettle-core" depends="compile-core, copy-core" description="generate the kettle core library kettle-core.jar">
+	  	<echo>Generating the Kettle core library kettle-core.jar ...</echo>
+	  	<jar jarfile="${lib}/kettle-core.jar" 
+	    	 basedir="${classes-core}" 
+	    	 includes="**/* ${version.file.path}"
+	  	     excludes="**/Thumbs.db **/*.jar **/*.swp"
+	  		>
+          <manifest>
+              <attribute name="Implementation-Title" value="${impl.title.engine}" />
+              <attribute name="Implementation-Version" value="${impl.version}" />
+              <attribute name="Implementation-Vendor" value="${impl.vendor}" />
+			<attribute name="Implementation-ProductID" value="${impl.productID}" />
+              <attribute name="Compile-Timestamp" value="${compile.timestamp}" />
+          </manifest>
+        </jar>
+	  </target>
 
-	  <target name="kettle" depends="compile, revision, copy" description="generate the kettle library kettle-engine-3.0.jar">
-	  	<echo>Generating the Kettle library kettle-engine-3.0.jar ...</echo>
-	  	<jar jarfile="${lib}/kettle-engine-3.0.jar" 
+	  <target name="kettle" depends="compile, revision, copy" description="generate the kettle library kettle-engine.jar">
+	  	<echo>Generating the Kettle library kettle-engine.jar ...</echo>
+	  	<jar jarfile="${lib}/kettle-engine.jar" 
 	    	 basedir="${classes}" 
 	    	 includes="**/* ${version.file.path}"
 	  	     excludes="**/Thumbs.db **/*.jar **/derbyOld/* **/derbyNew/* org/pentaho/di/run/**/*.ktr org/pentaho/di/run/**/*.txt org/pentaho/di/run/**/*.xls org/pentaho/di/run/**/*.swp org/pentaho/di/ui/**/*"
 	  		>
-                <manifest>
-                    <attribute name="Implementation-Title" value="${impl.title.engine}" />
-                    <attribute name="Implementation-Version" value="${impl.version}" />
-                    <attribute name="Implementation-Vendor" value="${impl.vendor}" />
-    				<attribute name="Implementation-ProductID" value="${impl.productID}" />
-                    <attribute name="Compile-Timestamp" value="${compile.timestamp}" />
-                </manifest>
+            <manifest>
+                <attribute name="Implementation-Title" value="${impl.title.engine}" />
+                <attribute name="Implementation-Version" value="${impl.version}" />
+                <attribute name="Implementation-Vendor" value="${impl.vendor}" />
+				<attribute name="Implementation-ProductID" value="${impl.productID}" />
+                <attribute name="Compile-Timestamp" value="${compile.timestamp}" />
+            </manifest>
         </jar>
-
-
 	  </target>	
 
-	  <target name="kettle-ui" depends="compile-ui" description="generate the kettle library kettle-ui-swt-3.0.jar">
-	  	<echo>Generating the Kettle library kettle-ui-swt-3.0.jar ...</echo>
-	  	<jar jarfile="${lib}/kettle-ui-swt-3.0.jar" 
+	  <target name="kettle-ui" depends="compile-ui" description="generate the kettle library kettle-ui-swt.jar">
+	  	<echo>Generating the Kettle library kettle-ui-swt.jar ...</echo>
+	  	<jar jarfile="${lib}/kettle-ui-swt.jar" 
 	    	 basedir="${classes-ui}" 
 	    	 includes="**/* ${version.file.path}"
 	  	     excludes="**/Thumbs.db **/kettle.jar">
@@ -246,7 +289,7 @@
 	        Distribution jar package
 	       ==========================
 	  -->
-	  <target name="distrib" depends="kettle, kettle-ui" description="copy jar file to distribution directory" >
+	  <target name="distrib" depends="kettle-core, kettle, kettle-ui" description="copy jar file to distribution directory" >
 	  	<echo>Construct the distribution package...</echo>
 
 	        <!-- root directory -->
@@ -257,8 +300,9 @@
 
 	  		<!-- base lib -->
 	  		<mkdir dir="${distrib}/lib"/>
-  			<copy todir="${distrib}/lib"  file="${lib}/kettle-engine-3.0.jar"/>
-  			<copy todir="${distrib}/lib"  file="${lib}/kettle-ui-swt-3.0.jar"/>
+			<copy todir="${distrib}/lib"  file="${lib}/kettle-core.jar"/>
+  			<copy todir="${distrib}/lib"  file="${lib}/kettle-engine.jar"/>
+  			<copy todir="${distrib}/lib"  file="${lib}/kettle-ui-swt.jar"/>
 
   	        <!-- external libs (jdbc etc) -->
 	  		<mkdir dir="${distrib}/libext"/>
@@ -517,7 +561,7 @@
 
 		<junit printsummary="no" fork="yes" forkmode="perTest" jvm="java" maxmemory="512M" showoutput="yes">
 	    	<classpath>
-				<fileset dir="${lib}" includes="kettle-engine-3.0.jar"/>
+				<fileset dir="${lib}" includes="kettle-engine.jar"/>
 				<fileset dir="test/libext/" includes="kettle.jar"/>
 	    		<pathelement path="${testClasses}"/>
 
@@ -548,7 +592,7 @@
 
 		<junit printsummary="no" fork="yes" forkmode="perTest" jvm="java" maxmemory="512M" showoutput="yes">
 	    	<classpath>
-				<fileset dir="${lib}" includes="kettle-engine-3.0.jar"/>
+				<fileset dir="${lib}" includes="kettle-engine.jar"/>
 				<fileset dir="test/libext/" includes="kettle.jar"/>
 	    		<pathelement path="${testClasses}"/>
 
@@ -575,7 +619,7 @@
 
 		<junit printsummary="no" fork="yes" forkmode="perTest" jvm="java" maxmemory="512M" showoutput="yes">
 	    	<classpath>
-				<fileset dir="${lib}" includes="kettle-engine-3.0.jar"/>
+				<fileset dir="${lib}" includes="kettle-engine.jar"/>
 				<fileset dir="test/libext/" includes="kettle.jar"/>
 	    		<pathelement path="${testClasses}"/>
 
@@ -610,7 +654,7 @@
 
 		<junit printsummary="no" fork="yes" forkmode="perTest" jvm="java" maxmemory="512M" showoutput="yes">
 	    	<classpath>
-				<fileset dir="${lib}" includes="kettle-engine-3.0.jar"/>
+				<fileset dir="${lib}" includes="kettle-engine.jar"/>
 				<fileset dir="test/libext/" includes="kettle.jar"/>
 				<!-- fileset dir="test/libext/" includes="junit.jar"/ -->
 	    		<pathelement path="${testClasses}"/>
@@ -680,6 +724,7 @@
 	  <target name="cleandirs" description="clean up generated files">
 	    <delete dir="${classes}"/>
 	    <delete dir="${classes-ui}"/>
+	    <delete dir="${classes-core}"/>
 	    <delete dir="${lib}"/>
 	    <delete dir="${distrib}"/>
 	  	<delete dir="${api}"/>

diff --git a/...rg/pentaho/di/compatibility/Messages.java → ...rg/pentaho/di/compatibility/Messages.java b/...rg/pentaho/di/compatibility/Messages.java → ...rg/pentaho/di/compatibility/Messages.java
diff --git a/src/org/pentaho/di/compatibility/Row.java → ...ore/org/pentaho/di/compatibility/Row.java b/src/org/pentaho/di/compatibility/Row.java → ...ore/org/pentaho/di/compatibility/Row.java
diff --git a/src/org/pentaho/di/compatibility/Value.java → ...e/org/pentaho/di/compatibility/Value.java b/src/org/pentaho/di/compatibility/Value.java → ...e/org/pentaho/di/compatibility/Value.java
diff --git a/...taho/di/compatibility/ValueBigNumber.java → ...taho/di/compatibility/ValueBigNumber.java b/...taho/di/compatibility/ValueBigNumber.java → ...taho/di/compatibility/ValueBigNumber.java
diff --git a/...pentaho/di/compatibility/ValueBinary.java → ...pentaho/di/compatibility/ValueBinary.java b/...pentaho/di/compatibility/ValueBinary.java → ...pentaho/di/compatibility/ValueBinary.java
diff --git a/...entaho/di/compatibility/ValueBoolean.java → ...entaho/di/compatibility/ValueBoolean.java b/...entaho/di/compatibility/ValueBoolean.java → ...entaho/di/compatibility/ValueBoolean.java
diff --git a/...g/pentaho/di/compatibility/ValueDate.java → ...g/pentaho/di/compatibility/ValueDate.java b/...g/pentaho/di/compatibility/ValueDate.java → ...g/pentaho/di/compatibility/ValueDate.java
diff --git a/...entaho/di/compatibility/ValueInteger.java → ...entaho/di/compatibility/ValueInteger.java b/...entaho/di/compatibility/ValueInteger.java → ...entaho/di/compatibility/ValueInteger.java
diff --git a/...taho/di/compatibility/ValueInterface.java → ...taho/di/compatibility/ValueInterface.java b/...taho/di/compatibility/ValueInterface.java → ...taho/di/compatibility/ValueInterface.java
diff --git a/...pentaho/di/compatibility/ValueNumber.java → ...pentaho/di/compatibility/ValueNumber.java b/...pentaho/di/compatibility/ValueNumber.java → ...pentaho/di/compatibility/ValueNumber.java
diff --git a/...o/di/compatibility/ValueSerializable.java → ...o/di/compatibility/ValueSerializable.java b/...o/di/compatibility/ValueSerializable.java → ...o/di/compatibility/ValueSerializable.java
diff --git a/...pentaho/di/compatibility/ValueString.java → ...pentaho/di/compatibility/ValueString.java b/...pentaho/di/compatibility/ValueString.java → ...pentaho/di/compatibility/ValueString.java
diff --git a/...o/di/compatibility/ValueUsedListener.java → ...o/di/compatibility/ValueUsedListener.java b/...o/di/compatibility/ValueUsedListener.java → ...o/di/compatibility/ValueUsedListener.java
diff --git a/...org/pentaho/di/compatibility/package.html → ...org/pentaho/di/compatibility/package.html b/...org/pentaho/di/compatibility/package.html → ...org/pentaho/di/compatibility/package.html
diff --git a/src/org/pentaho/di/core/CheckResult.java → ...core/org/pentaho/di/core/CheckResult.java b/src/org/pentaho/di/core/CheckResult.java → ...core/org/pentaho/di/core/CheckResult.java
diff --git a/...pentaho/di/core/CheckResultInterface.java → ...pentaho/di/core/CheckResultInterface.java b/...pentaho/di/core/CheckResultInterface.java → ...pentaho/di/core/CheckResultInterface.java
diff --git a/...o/di/core/CheckResultSourceInterface.java → ...o/di/core/CheckResultSourceInterface.java b/...o/di/core/CheckResultSourceInterface.java → ...o/di/core/CheckResultSourceInterface.java
diff --git a/src/org/pentaho/di/core/Const.java → src-core/org/pentaho/di/core/Const.java b/src/org/pentaho/di/core/Const.java → src-core/org/pentaho/di/core/Const.java
diff --git a/src/org/pentaho/di/core/Counter.java → src-core/org/pentaho/di/core/Counter.java b/src/org/pentaho/di/core/Counter.java → src-core/org/pentaho/di/core/Counter.java
diff --git a/src/org/pentaho/di/core/Counters.java → src-core/org/pentaho/di/core/Counters.java b/src/org/pentaho/di/core/Counters.java → src-core/org/pentaho/di/core/Counters.java
diff --git a/src/org/pentaho/di/core/DBCache.java → src-core/org/pentaho/di/core/DBCache.java b/src/org/pentaho/di/core/DBCache.java → src-core/org/pentaho/di/core/DBCache.java
diff --git a/src/org/pentaho/di/core/DBCacheEntry.java → ...ore/org/pentaho/di/core/DBCacheEntry.java b/src/org/pentaho/di/core/DBCacheEntry.java → ...ore/org/pentaho/di/core/DBCacheEntry.java
diff --git a/...pentaho/di/core/DescriptionInterface.java → ...pentaho/di/core/DescriptionInterface.java b/...pentaho/di/core/DescriptionInterface.java → ...pentaho/di/core/DescriptionInterface.java
diff --git a/src/org/pentaho/di/core/Messages.java → src-core/org/pentaho/di/core/Messages.java b/src/org/pentaho/di/core/Messages.java → src-core/org/pentaho/di/core/Messages.java
diff --git a/...org/pentaho/di/core/ObjectUsageCount.java → ...org/pentaho/di/core/ObjectUsageCount.java b/...org/pentaho/di/core/ObjectUsageCount.java → ...org/pentaho/di/core/ObjectUsageCount.java
diff --git a/src/org/pentaho/di/core/PDIClassLoader.java → ...e/org/pentaho/di/core/PDIClassLoader.java b/src/org/pentaho/di/core/PDIClassLoader.java → ...e/org/pentaho/di/core/PDIClassLoader.java
diff --git a/...taho/di/core/ProgressMonitorListener.java → ...taho/di/core/ProgressMonitorListener.java b/...taho/di/core/ProgressMonitorListener.java → ...taho/di/core/ProgressMonitorListener.java
diff --git a/src/org/pentaho/di/core/Props.java → src-core/org/pentaho/di/core/Props.java b/src/org/pentaho/di/core/Props.java → src-core/org/pentaho/di/core/Props.java
diff --git a/src/org/pentaho/di/core/Result.java → src-core/org/pentaho/di/core/Result.java b/src/org/pentaho/di/core/Result.java → src-core/org/pentaho/di/core/Result.java
diff --git a/src/org/pentaho/di/core/ResultFile.java → src-core/org/pentaho/di/core/ResultFile.java b/src/org/pentaho/di/core/ResultFile.java → src-core/org/pentaho/di/core/ResultFile.java
diff --git a/src/org/pentaho/di/core/RowMetaAndData.java → ...e/org/pentaho/di/core/RowMetaAndData.java b/src/org/pentaho/di/core/RowMetaAndData.java → ...e/org/pentaho/di/core/RowMetaAndData.java
diff --git a/src/org/pentaho/di/core/RowSet.java → src-core/org/pentaho/di/core/RowSet.java b/src/org/pentaho/di/core/RowSet.java → src-core/org/pentaho/di/core/RowSet.java
diff --git a/src/org/pentaho/di/core/SQLStatement.java → ...ore/org/pentaho/di/core/SQLStatement.java b/src/org/pentaho/di/core/SQLStatement.java → ...ore/org/pentaho/di/core/SQLStatement.java
diff --git a/...entaho/di/core/SourceToTargetMapping.java → ...entaho/di/core/SourceToTargetMapping.java b/...entaho/di/core/SourceToTargetMapping.java → ...entaho/di/core/SourceToTargetMapping.java
diff --git a/src/org/pentaho/di/core/TimedRow.java → src-core/org/pentaho/di/core/TimedRow.java b/src/org/pentaho/di/core/TimedRow.java → src-core/org/pentaho/di/core/TimedRow.java
diff --git a/...entaho/di/core/config/OgnlExpression.java → ...entaho/di/core/config/OgnlExpression.java b/...entaho/di/core/config/OgnlExpression.java → ...entaho/di/core/config/OgnlExpression.java
diff --git a/...entaho/di/core/config/PropertySetter.java → ...entaho/di/core/config/PropertySetter.java b/...entaho/di/core/config/PropertySetter.java → ...entaho/di/core/config/PropertySetter.java
diff --git a/...o/di/core/database/AS400DatabaseMeta.java → ...o/di/core/database/AS400DatabaseMeta.java b/...o/di/core/database/AS400DatabaseMeta.java → ...o/di/core/database/AS400DatabaseMeta.java
diff --git a/...ho/di/core/database/BaseDatabaseMeta.java → ...ho/di/core/database/BaseDatabaseMeta.java b/...ho/di/core/database/BaseDatabaseMeta.java → ...ho/di/core/database/BaseDatabaseMeta.java
diff --git a/...o/di/core/database/CacheDatabaseMeta.java → ...o/di/core/database/CacheDatabaseMeta.java b/...o/di/core/database/CacheDatabaseMeta.java → ...o/di/core/database/CacheDatabaseMeta.java
diff --git a/...org/pentaho/di/core/database/Catalog.java → ...org/pentaho/di/core/database/Catalog.java b/...org/pentaho/di/core/database/Catalog.java → ...org/pentaho/di/core/database/Catalog.java
diff --git a/.../di/core/database/ConnectionPoolUtil.java → .../di/core/database/ConnectionPoolUtil.java b/.../di/core/database/ConnectionPoolUtil.java → .../di/core/database/ConnectionPoolUtil.java
diff --git a/...aho/di/core/database/DB2DatabaseMeta.java → ...aho/di/core/database/DB2DatabaseMeta.java b/...aho/di/core/database/DB2DatabaseMeta.java → ...aho/di/core/database/DB2DatabaseMeta.java
diff --git a/...rg/pentaho/di/core/database/Database.java → ...rg/pentaho/di/core/database/Database.java b/...rg/pentaho/di/core/database/Database.java → ...rg/pentaho/di/core/database/Database.java
diff --git a/...base/DatabaseConnectionPoolParameter.java → ...base/DatabaseConnectionPoolParameter.java b/...base/DatabaseConnectionPoolParameter.java → ...base/DatabaseConnectionPoolParameter.java
diff --git a/...aho/di/core/database/DatabaseFactory.java → ...aho/di/core/database/DatabaseFactory.java b/...aho/di/core/database/DatabaseFactory.java → ...aho/di/core/database/DatabaseFactory.java
diff --git a/...re/database/DatabaseFactoryInterface.java → ...re/database/DatabaseFactoryInterface.java b/...re/database/DatabaseFactoryInterface.java → ...re/database/DatabaseFactoryInterface.java
diff --git a/...o/di/core/database/DatabaseInterface.java → ...o/di/core/database/DatabaseInterface.java b/...o/di/core/database/DatabaseInterface.java → ...o/di/core/database/DatabaseInterface.java