diff --git a/UI/org.eclipse.birt.report.designer.tests/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.tests/META-INF/MANIFEST.MF
index 556170323bd..1b32884eb19 100644
--- a/UI/org.eclipse.birt.report.designer.tests/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.tests/META-INF/MANIFEST.MF
@@ -39,5 +39,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.birt.report.designer.ui.views;bundle-version="4.13.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-ClassPath: designertests.jar
+Bundle-ClassPath: .
 Automatic-Module-Name: org.eclipse.birt.report.designer.tests
diff --git a/UI/org.eclipse.birt.report.designer.tests/build.properties b/UI/org.eclipse.birt.report.designer.tests/build.properties
index a5677ff1425..236acca7a64 100644
--- a/UI/org.eclipse.birt.report.designer.tests/build.properties
+++ b/UI/org.eclipse.birt.report.designer.tests/build.properties
@@ -13,13 +13,12 @@
 bin.includes = .,\
                META-INF/,\
                about.html,\
-               designertests.jar,\
                plugin.xml,\
                test.xml,\
                icon/,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-output.designertests.jar = target/classes/
-source.designertests.jar = test/,\
-                           src/
+output.. = target/classes/
+source.. = test/,\
+           src/
 src.includes = about.html
diff --git a/UI/org.eclipse.birt.report.designer.ui.data/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.data/META-INF/MANIFEST.MF
index 60ea6dca63d..95a317d0d62 100644
--- a/UI/org.eclipse.birt.report.designer.ui.data/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.data/META-INF/MANIFEST.MF
@@ -25,6 +25,5 @@ Export-Package: org.eclipse.birt.report.designer.data.ui.actions,
  org.eclipse.birt.report.designer.data.ui.datasource,
  org.eclipse.birt.report.designer.data.ui.providers,
  org.eclipse.birt.report.designer.data.ui.util
-Bundle-ClassPath: library.jar,
- .
+Bundle-ClassPath: .
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.data
diff --git a/UI/org.eclipse.birt.report.designer.ui.ide/BuildDesignerIDE.xml b/UI/org.eclipse.birt.report.designer.ui.ide/BuildDesignerIDE.xml
deleted file mode 100644
index a194a944385..00000000000
--- a/UI/org.eclipse.birt.report.designer.ui.ide/BuildDesignerIDE.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0"?>
-<!--
- *************************************************************************
- * Copyright (c) 2004, 2005 Actuate Corporation.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- *
- * Contributors:
- *  Actuate Corporation  - initial API and implementation
- *  
- *************************************************************************
- *
- *  BuildDesignerIDE.xml
- *
- *  Created on 08/01/2005
- *  Build script for project org.eclipse.birt.designer.ui.ide
- *
- * 
- * The following are public targets callable by external users. 
- * 
- * "Clean" - Clean all objects created by this script. Individual project build script can not call this target; 
- * "Jar" - Compile source code and generate jar for this project.
- *          The compile dependency on other projects should be defined explicitly.
- *         eclipse.home should be passed in when Individual project build script  call this target; 
- *          the property of "failonerror" should be set true(default) when compiling source code
- * "UnitTest" - Run unit tests. This task must be called after calling Jar task, 
- *              so it needn't depend on Jar explicitly
- * "Export" - Export the project, for instance, jar files are copied to a designated folder. 
- *            this task must be called after calling Jar task, so it needn't depend on Jar explicitly
- * "JavaDoc" - generate java documents
- *
- * Usage:
- *    ant [any one or more of the public targets] 
- *        -Declipse.home=<your eclipse home> 
- *   
- * Default target is "Jar".
- * 
- * This script may also additional targets. These targets are private to this build script only. 
- *
- *
- * Notes:
- *  1. classpath need to be set for junit.jar
- *  2. This file now requires Ant 1.6
- *
- * Change History:
- *
- *    1. 03/16/2005: initial version
- *    2. 02/27/2006
- *    3. 03/16/2006: single jar version
--->
-
-
-<project name="BIRT Designer UI for IDE Project" default="Jar" basedir=".">
-
-
-	<description>BIRT Designer UI for IDE Project.</description>
-	<!-- set global properties for this build -->
-	<!-- Public properties, used by public targets, top level build script
-		     will pass on the value at runtime. Properties will have there default
-		     value.
-		     eclipse.home
-		     utest.report.dir
-		     javadoc.dir
-		     plugin.version
-		
-	-->
-
-	<property name="eclipse.home" location="." />
-	
-	<property name="export.dir" location="export" />
-	<property name="javadoc.dir" location="docs/api" />
-	<property name="utest.report.dir" location="utestreports" />
-	
-	<!--properties -->
-	<property name="dir.src" location="src" />
-	<property name="dir.bin" location="temp.folder"/>	
-	<property name="module.name" value="org.eclipse.birt.report.designer.ui.ide" />
-	<property name="designer.lib.dir" value="../org.eclipse.birt.report.designer.ui.lib" />			
-	<property name="designer.lib.explorer.dir" value="../org.eclipse.birt.report.designer.ui.lib.explorer" />			
-	<property name="designer.editor.dir" value="../org.eclipse.birt.report.designer.ui.editors" />			
-	<property name="designer.editor.schematic.dir" value="../org.eclipse.birt.report.designer.ui.editors.schematic" />			
-	<property name="viewer.dir" value="../org.eclipse.birt.report.viewer" />		
-	
-	<property name="arch" value="x86" />	
-	
-	<tstamp>
-    	<format property="TODAY" pattern="yyyyMMdd-hhmm"/>
-	</tstamp>
-
-	<!-- Class Path used to generate Javadoc-->
-	<path id="class.path">
-		<pathelement path="${build.dir}" />
-		<pathelement path="${viewer.dir}/viewer.jar"/>
-		
-		<fileset dir="${designer.core.dir}">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${designer.ui.dir}">
-			<include name="*.jar" />
-		</fileset>		
-	
-	</path>
-	
-	
-	<!-- set platform related properties-->
-	<condition property="ws" value="win32">
-		<os family="windows"/>
-	</condition>
-	<condition property="ws" value="gtk">
-		<not>
-			<os family="windows"/>
-		</not>
-	</condition>
-
-	<condition property="os" value="win32">
-		<os family="windows"/>
-	</condition>
-	<condition property="os" value="linux">
-		<not>
-			<os family="windows"/>
-		</not>
-	</condition>
-		
-	
-	<target name="checkBuildScript">		
-	   	<available file="build.xml" property="buildScript.available"/>
-	</target>
-					
-	<!-- Compile source code and generate jar for this project.
-		 Input parameters:
-		 	eclipse.home
-	-->
-	<target name="Jar" depends="build,clearJars">
-		<java classpath="${eclipse.home}/startup.jar" classname="org.eclipse.core.launcher.Main" fork="true" dir="." failonerror="true">
-			<arg line="-application org.eclipse.ant.core.antRunner -file build.xml build.update.jar" />
-			<jvmarg line="-Declipse.home=${eclipse.home} -Dclean=true -Dos=${os} -Dws=${ws} -Darch=${arch} -DjavacSource=1.4 -DjavacTarget=1.4" />
-		</java>
-	</target>
-
-	<!-- Export the project, for instance, jar files are copied to a designated folder
-		 the dependency on Jar should implement in top level script by call sequence	
-		 Parameters:
-		 		- ${export.dir} target directory to put the plugin binaries
-		 		- ${plugin.version} the version of plugin exported
-	 -->
-	<target name="Export" description="Export">
-		<copy todir="${export.dir}">
-			<fileset dir="." includes="${module.name}*.jar" />
-		</copy>
-	</target>
-	
-	<!-- No unit tests, dummy target -->
-	<target name="UnitTest" />
-
-	<!-- Clean all objects created by this script -->
-	<target name="Clean" description="clean up">
-		<antcall target="cleanByScript"/>
-		<antcall target="exceptionalClean"/>
-	</target>
-	
-	<!-- Clean all objects by the script generated -->
-	<target name="cleanByScript" description="clean up by script generated" depends="checkBuildScript" if="buildScript.available">
-		<ant target="clean"/>
-	</target>
-
-	<!-- Clean all objects manually when the script generated is lost-->
-	<target name="exceptionalClean" depends="checkBuildScript,clearJars" unless="buildScript.available">
-		<delete dir="${dir.bin}" />
-	</target>
-
-	<!-- Generate the JavaDoc.
-		 Parameters:
-		 		- ${javadoc.dir} target directory to put the java document
-	 -->
-	<target name="Javadoc">
-		<mkdir dir="${javadoc.dir}" />
-		<javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" access="private" windowtitle="Birt Designer Core API" source="1.4" packagenames="org.eclipse.birt.*">
-			<packageset dir="${dir.src}" defaultexcludes="yes" />
-			<bottom>
-				<![CDATA[<i>Copyright &#169;  2006 Actuate Corp. All rights reserved. </i>]]></bottom>
-			<classpath refid="class.path" />
-		</javadoc>
-	</target>
-	
-	<target name="doGenerateBuildScript">
-		<eclipse.buildScript elements="plugin@${module.name}" workingDirectory="${eclipse.home}"/>
-	</target>
-	
-	
-	<target name="generateBuildScript">
-		<java classpath="${eclipse.home}/startup.jar" classname="org.eclipse.core.launcher.Main" fork="true" dir="." failonerror="true">
-			<arg line="-application org.eclipse.ant.core.antRunner -file BuildDesignerIDE.xml doGenerateBuildScript -Declipse.home=${eclipse.home} -Dclean=true" />
-		</java>		
-		<delete dir="workspace"/>
-	</target>
-	
-	<target name="buildDependents">
-		<ant dir="${designer.lib.dir}" antfile="BuildDesignerLib.xml" target="build" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}"/>
-			<property name="os" value="${os}"/>
-			<property name="ws" value="${ws}"/>
-			<property name="arch" value="${arch}"/>
-		</ant>
-		<ant dir="${designer.lib.explorer.dir}" antfile="BuildLibraryExplorer.xml" target="build" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}"/>
-			<property name="os" value="${os}"/>
-			<property name="ws" value="${ws}"/>
-			<property name="arch" value="${arch}"/>
-		</ant>
-		<ant dir="${designer.editor.dir}" antfile="BuildDesignerEditors.xml" target="build" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}"/>
-			<property name="os" value="${os}"/>
-			<property name="ws" value="${ws}"/>
-			<property name="arch" value="${arch}"/>
-		</ant>
-		<ant dir="${designer.editor.schematic.dir}" antfile="BuildDesignerEditorSchematic.xml" target="build" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}"/>
-			<property name="os" value="${os}"/>
-			<property name="ws" value="${ws}"/>
-			<property name="arch" value="${arch}"/>
-		</ant>
-	</target>	
-	
-	<target name="build" depends="buildDependents,generateBuildScript">
-		<ant inheritAll="false">
-			<property name="javacFailOnError" value="true" />
-			<property name="javacSource" value="1.4" />
-			<property name="javacTarget" value="1.4" />
-			<property name="os" value="${os}" />
-			<property name="ws" value="${ws}" />
-			<property name="arch" value="${arch}" />
-		</ant>
-	</target>
-	
-	<target name="clearJars">
-		<delete>
-			<fileset dir=".">
-				<include name="${module.name}*.jar" />
-			</fileset>
-		</delete>
-	</target>
-</project>
diff --git a/UI/org.eclipse.birt.report.designer.ui.lib/BuildDesignerLib.xml b/UI/org.eclipse.birt.report.designer.ui.lib/BuildDesignerLib.xml
deleted file mode 100644
index d5d47f02a72..00000000000
--- a/UI/org.eclipse.birt.report.designer.ui.lib/BuildDesignerLib.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0"?>
-<!--
- *************************************************************************
- * Copyright (c) 2004, 2005 Actuate Corporation.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- *
- * Contributors:
- *  Actuate Corporation  - initial API and implementation
- *  
- *************************************************************************
- *
- *  BuildDesignerLib.xml
- *
- *  Created on 9/21/2005
- *  Build script for project org.eclipse.birt.designer.ui
- *
- * 
- * The following are public targets callable by external users. 
- * 
- * "Clean" - Clean all objects created by this script. Individual project build script can not call this target; 
- * "Jar" - Compile source code and generate jar for this project.
- *          The compile dependency on other projects should be defined explicitly.
- *         eclipse.home should be passed in when Individual project build script  call this target; 
- *          the property of "failonerror" should be set true(default) when compiling source code
- * "UnitTest" - Run unit tests. This task must be called after calling Jar task, 
- *              so it needn't depend on Jar explicitly
- * "Export" - Export the project, for instance, jar files are copied to a designated folder. 
- *            this task must be called after calling Jar task, so it needn't depend on Jar explicitly
- * "JavaDoc" - generate java documents
- *
- * Usage:
- *    ant [any one or more of the public targets] 
- *        -Declipse.home=<your eclipse home> 
- *   
- * Default target is "Jar".
- * 
- * This script may also additional targets. These targets are private to this build script only. 
- *
- *
- * Notes:
- *  1. classpath need to be set for junit.jar
- *  2. This file now requires Ant 1.6
- *
- * Change History:
- *
- *    1. 09/21/2005: initial version
- *    2. 03/16/2006: single jar version
- *
--->
-
-
-<project name="BIRT Designer Libray Project" default="Jar" basedir=".">
-
-
-	<description>BIRT Designer Libray Project.</description>
-	<!-- set global properties for this build -->
-	<!-- Public properties, used by public targets, top level build script
-		     will pass on the value at runtime. Properties will have there default
-		     value.
-		     eclipse.home
-		     utest.report.dir
-		     javadoc.dir
-		     plugin.version
-		
-	-->
-
-	<property name="eclipse.home" location="." />
-
-	<property name="export.dir" location="export" />
-	<property name="javadoc.dir" location="docs/api" />
-	<property name="utest.report.dir" location="utestreports" />
-
-	<!--properties -->
-	<property name="dir.src" location="src" />
-	<property name="dir.bin" location="temp.folder" />
-	<property name="module.name" value="org.eclipse.birt.report.designer.ui.lib" />
-	<property name="designer.editor.dir" value="../org.eclipse.birt.report.designer.ui.editors" />
-	<property name="designer.editor.schematic.dir" value="../org.eclipse.birt.report.designer.ui.editors.schematic" />
-
-	<property name="arch" value="x86" />
-
-	<tstamp>
-		<format property="TODAY" pattern="yyyyMMdd-hhmm" />
-	</tstamp>
-
-	<!-- Class Path used to generate Javadoc-->
-	<path id="class.path">
-		<pathelement path="${build.dir}" />
-		<pathelement path="${viewer.dir}/viewer.jar" />
-
-		<fileset dir="${core.dir}">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${designer.core.dir}">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${designer.ui.dir}">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-
-
-	<!-- set platform related properties-->
-	<condition property="ws" value="win32">
-		<os family="windows" />
-	</condition>
-	<condition property="ws" value="gtk">
-		<not>
-			<os family="windows" />
-		</not>
-	</condition>
-
-	<condition property="os" value="win32">
-		<os family="windows" />
-	</condition>
-	<condition property="os" value="linux">
-		<not>
-			<os family="windows" />
-		</not>
-	</condition>
-
-
-	<target name="checkBuildScript">
-		<available file="build.xml" property="buildScript.available" />
-	</target>
-
-	<!-- Compile source code and generate jar for this projec.
-		 Input parameters:
-		 	eclipse.home
-	-->
-	<target name="Jar" depends="build,clearJars">
-		<java classpath="${eclipse.home}/startup.jar" classname="org.eclipse.core.launcher.Main" fork="true" dir="." failonerror="true">
-			<arg line="-application org.eclipse.ant.core.antRunner -file build.xml build.update.jar" />
-			<jvmarg line="-Declipse.home=${eclipse.home} -Dclean=true -Dos=${os} -Dws=${ws} -Darch=${arch} -DjavacSource=1.4 -DjavacTarget=1.4" />
-		</java>
-	</target>
-
-	<!-- Export the project, for instance, jar files are copied to a designated folder
-		 the dependency on Jar should implement in top level script by call sequence	
-		 Parameters:
-		 		- ${export.dir} target directory to put the plugin binaries
-		 		- ${plugin.version} the version of plugin exported
-	 -->
-	<target name="Export" description="Export">
-		<copy todir="${export.dir}">
-			<fileset dir="." includes="${module.name}*.jar" />
-		</copy>
-	</target>
-
-	<!-- No unit tests, dummy target -->
-	<target name="UnitTest" />
-
-	<!-- Clean all objects created by this script -->
-	<target name="Clean" description="clean up">
-		<antcall target="cleanByScript" />
-		<antcall target="exceptionalClean" />
-	</target>
-
-	<!-- Clean all objects by the script generated -->
-	<target name="cleanByScript" description="clean up by script generated" depends="checkBuildScript" if="buildScript.available">
-		<ant target="clean" />
-	</target>
-
-	<!-- Clean all objects manually when the script generated is lost-->
-	<target name="exceptionalClean" depends="checkBuildScript,clearJars" unless="buildScript.available">
-		<delete dir="${dir.bin}" />
-	</target>
-
-	<!-- Generate the JavaDoc.
-		 Parameters:
-		 		- ${javadoc.dir} target directory to put the java document
-	 -->
-	<target name="Javadoc">
-		<mkdir dir="${javadoc.dir}" />
-		<javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" access="private" windowtitle="Birt Designer Core API" source="1.4" packagenames="org.eclipse.birt.*">
-			<packageset dir="${dir.src}" defaultexcludes="yes" />
-			<bottom>
-				<![CDATA[<i>Copyright &#169;  2006 Actuate Corp. All rights reserved. </i>]]></bottom>
-		<classpath refid="class.path" />
-		</javadoc>
-	</target>
-	
-	<target name="doGenerateBuildScript">
-		<eclipse.buildScript elements="plugin@${module.name}" workingDirectory="${eclipse.home}" />
-	</target>
-	
-	
-	<target name="generateBuildScript">
-		<java classpath="${eclipse.home}/startup.jar" classname="org.eclipse.core.launcher.Main" fork="true" dir="." failonerror="true">
-			<arg line="-application org.eclipse.ant.core.antRunner -file BuildDesignerLib.xml doGenerateBuildScript -Declipse.home=${eclipse.home} -Dclean=true" />
-		</java>
-		<delete dir="workspace" />
-	</target>
-	
-	<target name="buildDependents">
-		<ant dir="${designer.editor.dir}" antfile="BuildDesignerEditors.xml" target="build" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}" />
-			<property name="os" value="${os}" />
-			<property name="ws" value="${ws}" />
-			<property name="arch" value="${arch}" />
-		</ant>
-		<ant dir="${designer.editor.schematic.dir}" antfile="BuildDesignerEditorSchematic.xml" target="build" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}" />
-			<property name="os" value="${os}" />
-			<property name="ws" value="${ws}" />
-			<property name="arch" value="${arch}" />
-		</ant>
-	</target>
-	
-	<target name="build" depends="buildDependents,generateBuildScript">
-		<ant inheritAll="false">
-			<property name="javacFailOnError" value="true" />
-			<property name="javacSource" value="1.4" />
-			<property name="javacTarget" value="1.4" />
-			<property name="os" value="${os}" />
-			<property name="ws" value="${ws}" />
-			<property name="arch" value="${arch}" />
-		</ant>
-	</target>
-	
-	<target name="clearJars">
-		<delete>
-			<fileset dir=".">
-				<include name="${module.name}*.jar" />
-			</fileset>
-		</delete>
-	</target>
-
-</project>
diff --git a/UI/org.eclipse.birt.report.designer.ui.lib/build.properties b/UI/org.eclipse.birt.report.designer.ui.lib/build.properties
index 68f5708bc82..b2f2b88566d 100644
--- a/UI/org.eclipse.birt.report.designer.ui.lib/build.properties
+++ b/UI/org.eclipse.birt.report.designer.ui.lib/build.properties
@@ -10,12 +10,11 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-jars.compile.order = .
 source.. = src/
+output.. = target/classes/
 bin.includes = META-INF/,\
 			   .,\
                plugin.xml,\
                plugin.properties,\
                about.html
-src.includes = about.html
-output.. = target/classes/
+src.includes = about.html
\ No newline at end of file
diff --git a/UI/org.eclipse.birt.report.designer.ui.rcp/BuildRCPUI.xml b/UI/org.eclipse.birt.report.designer.ui.rcp/BuildRCPUI.xml
deleted file mode 100644
index 3d763554785..00000000000
--- a/UI/org.eclipse.birt.report.designer.ui.rcp/BuildRCPUI.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0"?>
-<!--
- *************************************************************************
- * Copyright (c) 2004, 2005 Actuate Corporation.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- *
- * Contributors:
- *  Actuate Corporation  - initial API and implementation
- *  
- *************************************************************************
- *
- *  BuildRCPUI.xml
- *
- *  Created on 07/01/2005
- *  Build script for project org.eclipse.birt.designer.ui
- *
- * 
- * The following are public targets callable by external users. 
- * 
- * "Clean" - Clean all objects created by this script. Individual project build script can not call this target; 
- * "Jar" - Compile source code and generate jar for this project.
- *          The compile dependency on other projects should be defined explicitly.
- *         eclipse.home should be passed in when Individual project build script  call this target; 
- *          the property of "failonerror" should be set true(default) when compiling source code
- * "UnitTest" - Run unit tests. This task must be called after calling Jar task, 
- *              so it needn't depend on Jar explicitly
- * "Export" - Export the project, for instance, jar files are copied to a designated folder. 
- *            this task must be called after calling Jar task, so it needn't depend on Jar explicitly
- * "JavaDoc" - generate java documents
- *
- * Usage:
- *    ant [any one or more of the public targets] 
- *        -Declipse.home=<your eclipse home> 
- *   
- * Default target is "Jar".
- * 
- * This script may also additional targets. These targets are private to this build script only. 
- *
- *
- * Notes:
- *  1. classpath need to be set for junit.jar
- *  2. This file now requires Ant 1.6
- *
- * Change History:
- *
- *    1. 03/16/2005: initial version
- *    2. 03/16/2006: single jar version
--->
-
-
-<project name="BIRT Designer UI RCP Project" default="Jar" basedir=".">
-
-
-	<description>BIRT UI RCP Project.</description>
-	<!-- set global properties for this build -->
-	<!-- Public properties, used by public targets, top level build script
-		     will pass on the value at runtime. Properties will have there default
-		     value.
-		     eclipse.home
-		     utest.report.dir
-		     javadoc.dir
-		     plugin.version
-		
-	-->
-
-	<property name="eclipse.home" location="." />
-	
-	<property name="export.dir" location="export" />
-	<property name="javadoc.dir" location="docs/api" />
-	<property name="utest.report.dir" location="utestreports" />
-	<property name="designer.editor.dir" value="../org.eclipse.birt.report.designer.ui.editors" />			
-	<property name="designer.editor.schematic.dir" value="../org.eclipse.birt.report.designer.ui.editors.schematic" />			
-
-	
-	<!--properties -->
-	<property name="dir.src" location="src" />
-	<property name="dir.bin" location="temp.folder"/>	
-	<property name="module.name" value="org.eclipse.birt.report.designer.ui.rcp" />
-	<property name="designer.ui.dir" value="../org.eclipse.birt.report.designer.ui" />			
-	<property name="designer.lib.dir" value="../org.eclipse.birt.report.designer.ui.lib" />			
-	<property name="designer.lib.explorer.dir" value="../org.eclipse.birt.report.designer.ui.lib.explorer" />			
-	<property name="viewer.dir" value="../org.eclipse.birt.report.viewer" />		
-	
-	<property name="arch" value="x86" />	
-	
-	<tstamp>
-    	<format property="TODAY" pattern="yyyyMMdd-hhmm"/>
-	</tstamp>
-
-	<!-- Class Path used to generate Javadoc-->
-	<path id="class.path">
-		<pathelement path="${build.dir}" />
-		<pathelement path="${viewer.dir}/viewer.jar"/>
-		
-		<fileset dir="${designer.core.dir}">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${designer.ui.dir}">
-			<include name="*.jar" />
-		</fileset>		
-	
-	</path>
-	
-	
-	<!-- set platform related properties-->
-	<condition property="ws" value="win32">
-		<os family="windows"/>
-	</condition>
-	<condition property="ws" value="gtk">
-		<not>
-			<os family="windows"/>
-		</not>
-	</condition>
-
-	<condition property="os" value="win32">
-		<os family="windows"/>
-	</condition>
-	<condition property="os" value="linux">
-		<not>
-			<os family="windows"/>
-		</not>
-	</condition>
-		
-	
-	<target name="checkBuildScript">		
-	   	<available file="build.xml" property="buildScript.available"/>
-	</target>
-					
-	<!-- Compile source code and generate jar for this project.
-		 Input parameters:
-		 	eclipse.home
-	-->
-	<target name="Jar" depends="build,clearJars">
-		<java classpath="${eclipse.home}/startup.jar" classname="org.eclipse.core.launcher.Main" fork="true" dir="." failonerror="true">
-			<arg line="-application org.eclipse.ant.core.antRunner -file build.xml build.update.jar" />
-			<jvmarg line="-Declipse.home=${eclipse.home} -Dclean=true -Dos=${os} -Dws=${ws} -Darch=${arch} -DjavacSource=1.4 -DjavacTarget=1.4" />
-		</java>
-	</target>
-
-	<!-- Export the project, for instance, jar files are copied to a designated folder
-		 the dependency on Jar should implement in top level script by call sequence	
-		 Parameters:
-		 		- ${export.dir} target directory to put the plugin binaries
-		 		- ${plugin.version} the version of plugin exported
-	 -->
-	<target name="Export" description="Export">
-		<copy todir="${export.dir}">
-			<fileset dir="." includes="${module.name}*.jar" />
-		</copy>
-	</target>
-
-	<!-- No unit tests, dummy target -->
-	<target name="UnitTest" />
-
-	<!-- Clean all objects created by this script -->
-	<target name="Clean" description="clean up">
-		<antcall target="cleanByScript"/>
-		<antcall target="exceptionalClean"/>
-	</target>
-	
-	<!-- Clean all objects by the script generated -->
-	<target name="cleanByScript" description="clean up by script generated" depends="checkBuildScript" if="buildScript.available">
-		<ant target="clean"/>
-	</target>
-
-	<!-- Clean all objects manually when the script generated is lost-->
-	<target name="exceptionalClean" depends="checkBuildScript,clearJars" unless="buildScript.available">
-		<delete dir="${dir.bin}" />
-	</target>
-
-	<!-- Generate the JavaDoc.
-		 Parameters:
-		 		- ${javadoc.dir} target directory to put the java document
-	 -->
-	<target name="Javadoc">
-		<mkdir dir="${javadoc.dir}" />
-		<javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" access="private" windowtitle="Birt Designer Core API" source="1.4" packagenames="org.eclipse.birt.*">
-			<packageset dir="${dir.src}" defaultexcludes="yes" />
-			<bottom>
-				<![CDATA[<i>Copyright &#169;  2006 Actuate Corp. All rights reserved. </i>]]></bottom>
-			<classpath refid="class.path" />
-		</javadoc>
-	</target>
-	
-	<target name="doGenerateBuildScript">
-		<eclipse.buildScript elements="plugin@${module.name}" workingDirectory="${eclipse.home}"/>
-	</target>
-	
-	
-	<target name="generateBuildScript">
-		<java classpath="${eclipse.home}/startup.jar" classname="org.eclipse.core.launcher.Main" fork="true" dir="." failonerror="true">
-			<arg line="-application org.eclipse.ant.core.antRunner -file BuildRCPUI.xml doGenerateBuildScript -Declipse.home=${eclipse.home} -Dclean=true" />
-		</java>		
-		<delete dir="workspace"/>
-	</target>
-	
-	<target name="buildDependents">
-		<ant dir="${designer.ui.dir}" antfile="BuildDesignerUI.xml" target="build" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}"/>
-			<property name="os" value="${os}"/>
-			<property name="ws" value="${ws}"/>
-			<property name="arch" value="${arch}"/>
-		</ant>
-		<ant dir="${designer.lib.dir}" antfile="BuildDesignerLib.xml" target="build" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}"/>
-			<property name="os" value="${os}"/>
-			<property name="ws" value="${ws}"/>
-			<property name="arch" value="${arch}"/>
-		</ant>
-		<ant dir="${designer.lib.explorer.dir}" antfile="BuildLibraryExplorer.xml" target="build" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}"/>
-			<property name="os" value="${os}"/>
-			<property name="ws" value="${ws}"/>
-			<property name="arch" value="${arch}"/>
-		</ant>
-		<ant dir="${designer.editor.dir}" antfile="BuildDesignerEditors.xml" target="build" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}"/>
-			<property name="os" value="${os}"/>
-			<property name="ws" value="${ws}"/>
-			<property name="arch" value="${arch}"/>
-		</ant>
-		<ant dir="${designer.editor.schematic.dir}" antfile="BuildDesignerEditorSchematic.xml" target="Jar" inheritAll="false">
-			<property name="eclipse.home" value="${eclipse.home}"/>
-			<property name="os" value="${os}"/>
-			<property name="ws" value="${ws}"/>
-			<property name="arch" value="${arch}"/>
-		</ant>
-	</target>	
-	
-	
-	<target name="build" depends="buildDependents,generateBuildScript">
-		<ant inheritAll="false">
-			<property name="javacFailOnError" value="true" />
-			<property name="javacSource" value="1.4" />
-			<property name="javacTarget" value="1.4" />
-			<property name="os" value="${os}" />
-			<property name="ws" value="${ws}" />
-			<property name="arch" value="${arch}" />
-		</ant>
-	</target>
-	
-	<target name="clearJars">
-		<delete>
-			<fileset dir=".">
-				<include name="${module.name}*.jar" />
-			</fileset>
-		</delete>
-	</target>
-	
-</project>
diff --git a/UI/org.eclipse.birt.report.designer.ui.rcp/build.properties b/UI/org.eclipse.birt.report.designer.ui.rcp/build.properties
index 0ab8af2e6d8..ac2d60eb8d2 100644
--- a/UI/org.eclipse.birt.report.designer.ui.rcp/build.properties
+++ b/UI/org.eclipse.birt.report.designer.ui.rcp/build.properties
@@ -10,6 +10,8 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
+source.. = src/
+output.. = target/classes/
 bin.includes = plugin.xml,\
                .,\
                plugin.properties,\
@@ -17,7 +19,4 @@ bin.includes = plugin.xml,\
                about.html,\
                splash.png,\
                images/
-jars.compile.order = .
-source.. = src/
-output.. = target/classes/
 src.includes = about.html
diff --git a/UI/org.eclipse.birt.report.designer.ui/BuildDesignerUI.xml b/UI/org.eclipse.birt.report.designer.ui/BuildDesignerUI.xml
deleted file mode 100644
index e00ef4823c7..00000000000
--- a/UI/org.eclipse.birt.report.designer.ui/BuildDesignerUI.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0"?>
-<!--
- *************************************************************************
- * Copyright (c) 2004, 2005 Actuate Corporation.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- *
- * Contributors:
- *  Actuate Corporation  - initial API and implementation
- *  
- *************************************************************************
- *
- *  BuildDesignerUI.xml
- *
- *  Created on 03/16/2005
- *  Build script for project org.eclipse.birt.designer.ui
- *
- * 
- * The following are public targets callable by external users. 
- * 
- * "Clean" - Clean all objects created by this script. Individual project build script can not call this target; 
- * "Jar" - Compile source code and generate jar for this project.
- *          The compile dependency on other projects should be defined explicitly.
- *         eclipse.home should be passed in when Individual project build script  call this target; 
- *          the property of "failonerror" should be set true(default) when compiling source code
- * "UnitTest" - Run unit tests. This task must be called after calling Jar task, 
- *              so it needn't depend on Jar explicitly
- * "Export" - Export the project, for instance, jar files are copied to a designated folder. 
- *            this task must be called after calling Jar task, so it needn't depend on Jar explicitly
- * "JavaDoc" - generate java documents
- *
- * Usage:
- *    ant [any one or more of the public targets] 
- *        -Declipse.home=<your eclipse home> 
- *   
- * Default target is "Jar".
- * 
- * This script may also additional targets. These targets are private to this build script only. 
- *
- *
- * Notes:
- *  1. classpath need to be set for junit.jar
- *  2. This file now requires Ant 1.6
- *
- * Change History:
- *
- *    1. 03/16/2005: initial version
- *
--->
-
-
-<project name="BIRT Designer UI Project" default="Jar" basedir=".">
-
-
-	<description>BIRT Core Project.</description>
-	<!-- set global properties for this build -->
-	<!-- Public properties, used by public targets, top level build script
-		     will pass on the value at runtime. Properties will have there default
-		     value.
-		     eclipse.home
-		     utest.report.dir
-		     javadoc.dir
-		     plugin.version
-		
-	-->
-
-	<property name="eclipse.home" location="." />
-
-	<property name="export.dir" location="export" />
-	<property name="javadoc.dir" location="docs/api" />
-	<property name="utest.report.dir" location="utestreports" />
-	<property name="dtp.home" location=".." />
-
-	<!--properties -->
-	<property name="dir.src" location="src" />
-	<property name="dir.bin" location="temp.folder"/>
-	<property name="module.name" value="org.eclipse.birt.report.designer.ui" />
-	<property name="core.dir" value="../org.eclipse.birt.core" />
-	<property name="model.dir" value="../org.eclipse.birt.report.model" />
-	<property name="data.dir" value="../org.eclipse.birt.data" />
-	<property name="engine.dir" value="../org.eclipse.birt.report.engine" />
-	<property name="designer.core.dir" value="../org.eclipse.birt.report.designer.core" />
-	<property name="viewer.dir" value="../org.eclipse.birt.report.viewer" />
-	<property name="model.oda.adapter.dir" value="../org.eclipse.birt.report.model.adapter.oda" />
-	<property name="data.adapter.dir" value="../org.eclipse.birt.report.data.adapter" />
-	<property name="jar.name" value="ui.jar"/>
-
-	<property name="arch" value="x86" />
-
-	<tstamp>
-		<format property="TODAY" pattern="yyyyMMdd-hhmm"/>
-	</tstamp>
-
-	<!-- Class Path used to generate Javadoc-->
-	<path id="class.path">
-		<pathelement path="${build.dir}" />
-		<pathelement path="${viewer.dir}/viewer.jar"/>
-
-		<fileset dir="${core.dir}">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${model.dir}">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${data.dir}">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${engine.dir}">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${designer.core.dir}">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${model.oda.adapter.dir}">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-
-
-	<!-- set platform related properties-->
-	<condition property="ws" value="win32">
-		<os family="windows"/>
-	</condition>
-	<condition property="ws" value="gtk">
-		<not>
-			<os family="windows"/>
-		</not>
-	</condition>
-
-	<condition property="os" value="win32">
-		<os family="windows"/>
-	</condition>
-	<condition property="os" value="linux">
-		<not>
-			<os family="windows"/>
-		</not>
-	</condition>
-
-
-	<target name="checkBuildScript">
-		<available file="build.xml" property="buildScript.available"/>
-	</target>
-
-	<!-- Compile source code and generate jar for this projec.
-		 Input parameters:
-		 	eclipse.home
-	-->
-	<target name="Jar">
-		<antcall target="build"/>
-	</target>
-
-	<target name="build" depends="buildDependents,generateBuildScript">
-		<ant inheritAll="false">
-			<property name="javacFailOnError" value="true" />
-			<property name="javacSource" value="1.4" />
-			<property name="javacTarget" value="1.4" />
-			<property name="os" value="${os}" />
-			<property name="ws" value="${ws}" />
-			<property name="arch" value="${arch}" />
-		</ant>
-	</target>
-
-	<!-- Export the project, for instance, jar files are copied to a designated folder
-		 the dependency on Jar should implement in top level script by call sequence	
-		 Parameters:
-		 		- ${export.dir} target directory to put the plugin binaries
-		 		- ${plugin.version} the version of plugin exported
-	 -->
-	<target name="Export">
-		<property file="META-INF/MANIFEST.MF" />
-		<property name="plugin.package" value="${module.name}_${Bundle-Version}" />
-		<copy todir="${export.dir}\${plugin.package}">
-			<fileset dir=".">
-				<exclude name="plugin*.properties"/>
-				<include name="${jar.name}"/>
-				<include name=".options"/>
-				<include name="plugin*.*"/>
-				<include name="META-INF\**"/>
-				<include name="lib\*.jar"/>
-				<include name="icons\**"/>
-				<include name="templates\**"/>
-				<include name="schema\*.exsd"/>
-				<include name="schema\doc\*.*"/>
-				<include name="about.html"/>
-				<include name="nl\**\*"/>
-			</fileset>
-		</copy>
-		<copy todir="${export.dir}\${plugin.package}" overwrite="true">
-			<fileset dir=".">
-				<include name="plugin*.properties"/>
-			</fileset>
-			<filterset>
-				<filter token="BUILD" value="${BUILD_ID}"/>
-			</filterset>
-		</copy>
-	</target>
-
-	<!-- No unit tests, dummy target -->
-	<target name="UnitTest" />
-
-	<!-- Clean all objects created by this script -->
-	<target name="Clean" description="clean up">
-		<antcall target="cleanByScript"/>
-		<antcall target="exceptionalClean"/>
-	</target>
-
-	<!-- Clean all objects by the script generated -->
-	<target name="cleanByScript" description="clean up by script generated" depends="checkBuildScript" if="buildScript.available">
-		<ant target="clean"/>
-	</target>
-
-	<!-- Clean all objects manually when the script generated is lost-->
-	<target name="exceptionalClean" depends="checkBuildScript" unless="buildScript.available">
-		<delete dir="${dir.bin}" />
-		<delete file="${jar.name}" />
-	</target>
-
-	<!-- Generate the JavaDoc.
-		 Parameters:
-		 		- ${javadoc.dir} target directory to put the java document
-	 -->
-	<target name="Javadoc">
-		<mkdir dir="${javadoc.dir}" />
-		<javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" access="private" windowtitle="Birt Designer Core API" source="1.4" packagenames="org.eclipse.birt.*">
-			<packageset dir="${dir.src}" defaultexcludes="yes" />
-			<bottom>
-				<![CDATA[<i>Copyright &#169;  2005 Actuate Corp. All rights reserved. </i>]]></bottom>
-		<classpath refid="class.path" />
-	</javadoc>
-</target>
-
-<target name="doGenerateBuildScript">
-	<eclipse.buildScript elements="plugin@${module.name}" workingDirectory="${eclipse.home}"/>
-</target>
-
-
-<target name="generateBuildScript">
-	<java classpath="${eclipse.home}/startup.jar" classname="org.eclipse.core.launcher.Main" fork="true" dir="." failonerror="true">
-		<arg line="-application org.eclipse.ant.core.antRunner -file BuildDesignerUI.xml doGenerateBuildScript -Declipse.home=${eclipse.home} -Dclean=true" />
-	</java>
-	<delete dir="workspace"/>
-</target>
-
-<target name="buildDependents">
-	<ant dir="${engine.dir}" antfile="BuildEngine.xml" target="Jar" inheritAll="false">
-		<property name="eclipse.home" value="${eclipse.home}"/>
-	</ant>
-	<ant dir="${designer.core.dir}" antfile="BuildDesignerCore.xml" target="build" inheritAll="false">
-		<property name="eclipse.home" value="${eclipse.home}"/>
-		<property name="os" value="${os}"/>
-		<property name="ws" value="${ws}"/>
-		<property name="arch" value="${arch}"/>
-	</ant>
-	<ant dir="${model.oda.adapter.dir}" antfile="BuildModelOdaAdapter.xml" target="Jar" inheritAll="false">
-		<property name="eclipse.home" value="${eclipse.home}"/>
-	</ant>
-	<ant dir="${data.adapter.dir}" antfile="BuildDataAdapter.xml" target="Jar" inheritAll="false">
-		<property name="eclipse.home" value="${eclipse.home}"/>
-	</ant>
-</target>
-
-</project>
diff --git a/build/org.eclipse.birt.build/build.properties b/build/org.eclipse.birt.build/build.properties
index 45f6ad89297..1186d7da217 100644
--- a/build/org.eclipse.birt.build/build.properties
+++ b/build/org.eclipse.birt.build/build.properties
@@ -12,7 +12,6 @@
 # *******************************************************************************/
 bin.includes = META-INF/,\
                about.html,\
-               lib/,\
                .,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
diff --git a/build/org.eclipse.birt.build/lib/.gitignore b/build/org.eclipse.birt.build/lib/.gitignore
deleted file mode 100644
index be21aa8cea4..00000000000
--- a/build/org.eclipse.birt.build/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-dom4j-1.6.1.jar
diff --git a/build/org.eclipse.birt.build/lib/dummy.txt b/build/org.eclipse.birt.build/lib/dummy.txt
deleted file mode 100644
index 65c8003ceae..00000000000
--- a/build/org.eclipse.birt.build/lib/dummy.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Download dom4j 1.6.1 jar file from: 
-  http://sourceforge.net/projects/dom4j/files/ 
-  Copy the dom4j jars(dom4j-1.6.1.jar) to org.eclipse.birt.build/lib
\ No newline at end of file
diff --git a/build/org.eclipse.birt.releng.birtbuilder/eclipse/helper.xml b/build/org.eclipse.birt.releng.birtbuilder/eclipse/helper.xml
deleted file mode 100644
index 71f03420dd2..00000000000
--- a/build/org.eclipse.birt.releng.birtbuilder/eclipse/helper.xml
+++ /dev/null
@@ -1,1568 +0,0 @@
-<!--
- *******************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *   See git history
- *******************************************************************************
--->
-<project name="Helper targets" default="noDefault" basedir=".">
-	<property name="postingDirectory" value="${buildDirectory}" />
-	<property name="publishingContent" value="${eclipse.build.configs}/../publishingFiles" />
-
-	<!-- ===================================================================== -->
-	<!-- Set of helper targets for building the Eclipse SDK -->
-	<!-- ===================================================================== -->
-	<target name="discoverOS">
-		<condition property="onUnix">
-			<and>
-				<os family="unix" />
-			</and>
-		</condition>
-		<condition property="onWindows">
-			<and>
-				<os family="windows" />
-			</and>
-		</condition>
-	</target>
-
-	<target name="printWarnings" if="onWindows" depends="discoverOS">
-		<echo
-			message="The UNIX versions of your build output will be invalid.  Windows will not preserve symbolic links and permissions on executable files." />
-	</target>
-
-	<target name="setLabels">
-		<!--required -->
-		<!-- setup the label.properties file packaged in the source builds. -->
-		<!--Set this property to empty string -->
-		<property name="buildType" value="" />
-		<tstamp>
-			<format property="TODAY" pattern="MMMM d, yyyy" />
-			<format property="TSTAMP" pattern="HHmm" />
-		</tstamp>
-		<copy file="label.properties.template" tofile="${buildDirectory}/label.properties"
-			overwrite="true" />
-		<replace file="${buildDirectory}/label.properties" token="@builddate@"
-			value="${TODAY}" />
-		<replace file="${buildDirectory}/label.properties" token="@buildtype@"
-			value="${buildType}" />
-		<replace file="${buildDirectory}/label.properties" token="@ds@"
-			value="${timestamp}" />
-		<replace file="${buildDirectory}/label.properties" token="@buildid@"
-			value="${buildId}" />
-	</target>
-
-	<target name="generateChecksum" unless="skipChecksum">
-		<checksum file="${archiveFullPath}" property="md5" />
-		<echo message="${md5} *${downloadFile}"
-			file="${postingDirectory}/${buildLabel}/checksum/${downloadFile}.md5" />
-	</target>
-
-	<target name="publish" description="Preparing to post the build...">
-		<!--post clickThroughs -->
-		<copy todir="${postingDirectory}/${buildLabel}">
-			<fileset dir="${buildDirectory}/maps/org.eclipse.releng"
-				includes="clickThroughs/" />
-		</copy>
-
-		<!--post directory.txt -->
-		<copy file="${buildDirectory}/directory.txt" todir="${postingDirectory}/${buildLabel}" />
-
-		<!--post instructions on automated testing -->
-		<copy file="${eclipse.build.configs}/sdk.tests/testScripts/readme.html"
-			tofile="${postingDirectory}/${buildLabel}/automatedtesting.html" />
-		<copy file="${buildDirectory}/plugins/org.eclipse.test/testframework.html"
-			tofile="${postingDirectory}/${buildLabel}/testframework.html" />
-
-		<antcall target="generateEclipseIndex" />
-
-		<!--get static files required in the buildLabel directory -->
-		<copy todir="${postingDirectory}/${buildLabel}">
-			<fileset dir="${publishingContent}/staticDropFiles" />
-		</copy>
-
-		<!--copy buildnotes from plugin directories -->
-		<mkdir dir="${postingDirectory}/${buildLabel}/buildnotes" />
-		<copy todir="${postingDirectory}/${buildLabel}/buildnotes"
-			flatten="true">
-			<fileset dir="${buildDirectory}/plugins"
-				includes="**/buildnotes_*.html,**/buildnotes_*.htm,**/jdt_core_style.css" />
-		</copy>
-
-		<!--copy javadoc logs -->
-		<copy
-			file="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/doc.bin.log"
-			tofile="${postingDirectory}/${buildLabel}/compilelogs/platform.doc.isv.javadoc.txt"
-			failonerror="false" />
-		<copy file="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv/doc.bin.log"
-			tofile="${postingDirectory}/${buildLabel}/compilelogs/jdt.doc.isv.javadoc.txt"
-			failonerror="false" />
-		<copy
-			file="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv/jdtapt.doc.bin.log"
-			tofile="${postingDirectory}/${buildLabel}/compilelogs/jdt.apt.javadoc.txt"
-			failonerror="false" />
-		<copy file="${buildDirectory}/plugins/org.eclipse.pde.doc.user/doc.bin.log"
-			tofile="${postingDirectory}/${buildLabel}/compilelogs/pde.doc.user.javadoc.txt"
-			failonerror="false" />
-		<copy
-			file="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/platformconvert.txt"
-			tofile="${postingDirectory}/${buildLabel}/compilelogs/platform.doc.isv.schema.txt"
-			failonerror="false" />
-		<copy
-			file="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv/jdtconvert.txt"
-			tofile="${postingDirectory}/${buildLabel}/compilelogs/jdt.doc.isv.schema.txt"
-			failonerror="false" />
-		<copy
-			file="${buildDirectory}/plugins/org.eclipse.pde.doc.user/pdeconvert.txt"
-			tofile="${postingDirectory}/${buildLabel}/compilelogs/pde.doc.user.schema.txt"
-			failonerror="false" />
-
-	</target>
-
-
-	<!-- ===================================================================== -->
-	<!-- Target used to test the build -->
-	<!-- ===================================================================== -->
-	<target name="testAll" unless="skip.tests">
-		<waitfor maxwait="4" maxwaitunit="hour" checkevery="1"
-			checkeveryunit="minute">
-			<and>
-				<available
-					file="${postingDirectory}/${buildLabel}/checksum/eclipse-Automated-Tests-${buildId}.zip.md5" />
-				<available
-					file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-win32.zip.md5" />
-				<available
-					file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-linux-gtk.tar.gz.md5" />
-				<available
-					file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-macosx-carbon.tar.gz.md5" />
-			</and>
-		</waitfor>
-
-		<property name="cvstest.properties"
-			value="${base.builder}/../eclipseInternalBuildTools/cvstest.properties" />
-		<antcall target="configure.team.cvs.test" />
-
-		<!--replace buildid in vm.properties for JVM location settings -->
-		<replace dir="${eclipse.build.configs}/sdk.tests/testConfigs"
-			token="@buildid@" value="${buildId}" includes="**/vm.properties" />
-
-		<parallel>
-			<antcall target="test-JUnit" />
-			<antcall target="test-performance" />
-		</parallel>
-	</target>
-
-	<target name="test-JUnit">
-		<echo message="Starting tests." />
-		<property name="dropLocation" value="${postingDirectory}" />
-		<ant antfile="testAll.xml" dir="${eclipse.build.configs}/sdk.tests/testConfigs" />
-
-		<antcall target="generateEclipseIndex" />
-
-		<!--copy the test results and new index page to the posting location -->
-		<copy todir="${postingDirectory}/${buildLabel}" overwrite="true">
-			<fileset dir="${buildDirectory}/${buildLabel}" includes="testresults/**,*.php" />
-		</copy>
-		<replace file="${postingDirectory}/${buildLabel}/testResults.php"
-			token="@build@" value="${buildId}" />
-
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Target used to test the build -->
-	<!-- ===================================================================== -->
-	<target name="test-performance" unless="skip.performance.tests">
-		<echo message="Starting performance tests." />
-		<property name="dropLocation" value="${postingDirectory}" />
-		<ant antfile="testAll.xml" dir="${eclipse.build.configs}/sdk.tests/testConfigs"
-			target="performanceTests" />
-		<antcall target="generatePerformanceResults" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Target used to test the build for internal references -->
-	<!-- ===================================================================== -->
-	<target name="test-internalReferences">
-		<waitfor maxwait="4" maxwaitunit="hour" checkevery="1"
-			checkeveryunit="minute">
-			<available
-				file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-win32.zip.md5" />
-		</waitfor>
-
-		<property name="apiscanner"
-			value="${eclipse.build.configs}/sdk/tools/apiscanner" />
-		<property name="workingDir" value="${buildDirectory}/internalReference" />
-		<mkdir dir="${workingDir}" />
-		<unzip
-			src="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-win32.zip"
-			dest="${workingDir}" />
-
-		<java
-			classname="org.eclipse.wtp.releng.tools.component.violation.ComponentViolationEmitter"
-			fork="true" dir="${apiscanner}">
-			<arg
-				line="
-         	-eclipseDir ${workingDir}/eclipse
-         	-compXMLDir ${buildDirectory}/plugins
-         	-compRefDir component-ref
-         	-compVioDir ${postingDirectory}/${buildLabel}/internalReference
-         	-xsl xsl/component-violation.xsl
-         	-summaryXSL xsl/component-violation-summary.xsl" />
-			<classpath>
-				<fileset dir="${apiscanner}/lib" />
-			</classpath>
-		</java>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Helper targets -->
-	<!-- ===================================================================== -->
-
-
-	<target name="configure.team.cvs.test" unless="test.xml.tmp"
-		if="cvstest.properties">
-		<copy file="${eclipse.build.configs}/sdk.tests/testScripts/test.xml"
-			tofile="${eclipse.build.configs}/sdk.tests/testScripts/test.xml.tmp" />
-		<replace file="${eclipse.build.configs}/sdk.tests/testScripts/test.xml"
-			propertyFile="${cvstest.properties}">
-			<replacefilter token="${cvs_user}" property="cvs_user" />
-			<replacefilter token="${cvs_password}" property="cvs_password" />
-			<replacefilter token="${cvs_host}" property="cvs_host" />
-			<replacefilter token="${cvs_root}" property="cvs_root" />
-		</replace>
-		<delete file="${eclipse.build.configs}/sdk.tests/testScripts/test.xml.tmp" />
-	</target>
-
-
-
-	<target name="generatePerformanceResults">
-		<mkdir dir="${buildDirectory}/${buildLabel}/performance" />
-		<mkdir dir="${postingDirectory}/${buildLabel}/performance" />
-		<taskdef name="performanceResults"
-			classname="org.eclipse.releng.performance.PerformanceResultHtmlGenerator" />
-		<condition property="configArgs" value="-ws gtk -arch ppc">
-			<not>
-				<equals arg1="{os.arch}" arg2="i386" />
-			</not>
-		</condition>
-		<property name="configArgs" value="" />
-
-		<java
-			jar="${basedir}/../org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar"
-			fork="true" maxmemory="256m">
-			<arg
-				line="${configArgs} -application org.eclipse.test.performance.ui.resultGenerator
-					-baseline ${eclipse.perf.ref}
-					-baseline.prefix 3.2_200606291905
-					-current ${buildId}
-					-jvm ${eclipse.perf.jvm}
-					-output ${postingDirectory}/${buildLabel}/performance/
-					-config eclipseperfwin1_R3.3,eclipseperflnx1_R3.3,eclipseperfwin2_R3.3,eclipseperflnx2_R3.3,eclipseperflnx3_R3.3
-					-config.properties ${eclipse.perf.config.descriptors}
-					-scenario.pattern org.eclipse.%.test" />
-			<!-- add this argument to list above when there are milestone builds to 
-				highlight -highlight.latest 3.3M1_ -->
-			<env key="LD_LIBRARY_PATH" value="${basedir}/../org.eclipse.releng.basebuilder" />
-			<sysproperty key="eclipse.perf.dbloc" value="${dbloc}" />
-		</java>
-
-		<performanceResults
-			xmlDirectoryName="${postingDirectory}/${buildLabel}/performance/xml"
-			dropDirectoryName="${postingDirectory}/${buildLabel}"
-			testResultsTemplateFileName="${publishingContent}/templateFiles/performance.php.template"
-			testResultsHtmlFileName="performance/performance.php"
-			hrefTestResultsTargetPath="html"
-			testManifestFileName="${publishingContent}/performanceTestManifest.xml" />
-
-		<replace
-			file="${postingDirectory}/${buildLabel}/performance/performance.php"
-			token="@buildType@" value="${buildType}" />
-	</target>
-
-	<target name="verifyCompile">
-
-		<echo message="Checking for compile errors..." />
-		<echo message="Log file directory: ${postingDirectory}/${buildId}/compilelogs" />
-		<!--create html output for compile logs -->
-		<eclipse.convert input="${postingDirectory}/${buildId}/compilelogs/plugins"
-			validation="true" />
-
-		<antcall target="verifyCompileUtil" />
-		<antcall target="checkCompileError" />
-		<antcall target="generateCompileSummary" />
-
-	</target>
-
-	<target name="verifyCompileUtil">
-		<path id="customjar.classpath">
-			<fileset dir="${eclipse.build.configs}/../../extras/">
-				<include name="*.jar" />
-			</fileset>
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="org.apache.xerces_*.jar" />
-			</fileset>
-		</path>
-
-		<echo
-			message="Log file location: ${postingDirectory}/${buildId}/compilelogs/plugins" />
-		<echo
-			message="Verify compile properties: ${eclipse.build.configs}/../../monitor.properties" />
-		<echo
-			message="Verify compile console output: ${eclipse.build.configs}/../../verifyCompile.log" />
-		<!-- Using custom build tools to get failure/error summary of test result -->
-		<java classname="org.eclipse.birt.build.VerifyCompileUtils"
-			output="${eclipse.build.configs}/../../verifyCompile.log">
-			<classpath refid="customjar.classpath" />
-			<arg value="${postingDirectory}/${buildId}/compilelogs/plugins" />
-			<arg value="${eclipse.build.configs}/../../monitor.properties" />
-		</java>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-	<target name="buildUpdateJars">
-		<property name="updateJarWorkingDir" value="${buildDirectory}/updateJars" />
-		<mkdir dir="${updateJarWorkingDir}" />
-		<mkdir dir="${updateJarWorkingDir}/site" />
-
-		<!--eclipse-master-${buildId}.bak.zip contains the signed update jars. 
-			eclipse-master-${buildId}.zip contains the features and plug-ins unpacked. 
-			Need features in directory structures for tool to work. -->
-
-		<unzip
-			src="${buildDirectory}/${buildId}/birt-report-framework-sdk-${package.version}.zip"
-			dest="${updateJarWorkingDir}" />
-
-		<!--operation on creates update jars for features and for plug-ins which 
-			are to be unpacked when installed -->
-		<java classname="org.eclipse.releng.generators.UpdateBuilder">
-			<arg
-				line="-root ${updateJarWorkingDir}/eclipse -directory ${buildDirectory}/directory.txt -build ${buildId} -site ${updateJarWorkingDir}/site -sitexml ${updateSite}/site.xml" />
-			<classpath>
-				<pathelement
-					location="${base.builder}/plugins/org.eclipse.internal.build.tools/internalTools.jar" />
-				<pathelement
-					location="${base.builder}/plugins/org.eclipse.build.tools/buildTools.jar" />
-				<pathelement
-					location="${base.builder}/plugins/org.eclipse.osgi_3.2.0.v20060601.jar" />
-			</classpath>
-		</java>
-
-		<!--store previous site.xml -->
-		<move file="${updateSite}/site.xml" tofile="${updateSite}/site.xml.bak"
-			overwrite="true" />
-		<!--copy site.xml to update site -->
-		<copy todir="${updateSite}" overwrite="true">
-			<fileset dir="${updateJarWorkingDir}/site" includes="site.xml" />
-		</copy>
-
-		<mkdir dir="${updateSite}/features" />
-		<mkdir dir="${updateSite}/plugins" />
-
-		<!--use original signed update jars -->
-		<!-- back up <exec executable="unzip" dir="."> <arg line="-j ${buildDirectory}/${buildId}/birt-report-framework-sdk-${package.version}.bak.zip 
-			-i */features/* -x */master-equinox* */com.ibm.icu.base* -d ${updateSite}/features" 
-			/> </exec> -->
-		<exec executable="unzip" dir=".">
-			<arg
-				line="-j ${buildDirectory}/${buildId}/birt-report-framework-sdk-${package.version}.bak.zip -i */features/* -d ${updateSite}/features" />
-		</exec>
-		<java jar="${eclipse.home}/startup.jar" fork="true"
-			jvm="${java15-home}/bin/java" failonerror="true" maxmemory="128m"
-			dir="${buildDirectory}">
-			<arg line="-application org.eclipse.update.core.siteOptimizer" />
-			<arg
-				line="-digestBuilder -digestOutputDir=${updateSite} -siteXML=${updateSite}/site.xml" />
-		</java>
-	</target>
-
-	<target name="cleanSites">
-		<cleanSite ageInMinutes="1440"
-			directoryName="/builds/transfer/files/master/downloads/drops"
-			realDelete="true" />
-		<cleanSite ageInMinutes="1440"
-			directoryName="/builds/transfer/files/master/equinox/drops/"
-			realDelete="true" />
-		<cleanSite ageInMinutes="1440"
-			directoryName="/builds/transfer/files/bogus/downloads/drops"
-			realDelete="true" />
-		<cleanSite ageInMinutes="1440" directoryName="/builds/transfer/files/zrh"
-			realDelete="true" />
-		<cleanSite ageInMinutes="1440" directoryName="/builds/transfer/files/snz"
-			realDelete="true" />
-	</target>
-
-	<target name="CheckoutFromP4" depends="init">
-
-		<!-- check out org.eclipse.releng -->
-		<!-- check out version control files -->
-
-		<property file="${eclipse.build.configs}/../../config.properties" />
-
-		<echo message="p4.workspace=${p4.workspace}" />
-		<echo message="p4.home=${p4.home}" />
-		<echo message="p4.client=${p4.client}" />
-
-
-		<delete dir="${p4.workspace}/Development/JRP/Dev/build"
-			failonerror="false" />
-		<mkdir dir="${p4.workspace}/Development/JRP/Dev/build" />
-
-		<delete dir="${p4.home}/CvsDiff" failonerror="false" />
-		<delete dir="${p4.home}/reportTestsLib" failonerror="false" />
-
-		<!-- checkout the package to checkout.dir -->
-		<echo message="checking out daily build scripts" />
-
-		<!-- //${p4.client}/Development/JRP/Dev/build/sampleReports/... //${p4.client}/Development/JRP/Dev/build/cvsDiff/... -->
-		<p4sync
-			view="//${p4.client}/Development/JRP/Dev/build/script/... 
-                      //${p4.client}/Development/JRP/Dev/build/lib/... 
-     		  //${p4.client}/Development/JRP/Dev/build/AutomationLib/...
-	          //${p4.client}/Development/JRP/Dev/birt/org.eclipse.birt.report.data.oda.jdbc/jdbc-drivers/..."
-			port="${p4.port}" user="${p4.user}" globalopts="-P ${p4.passwd}"
-			failonerror="true" force="true" />
-
-		<copy todir="${p4.home}/reportTestsLib" overwrite="true"
-			failonerror="true">
-			<fileset dir="${p4.workspace}/Development/JRP/Dev/build/AutomationLib" />
-		</copy>
-		<copy todir="${p4.home}/drivers" overwrite="true" failonerror="true">
-			<fileset
-				dir="${p4.workspace}/Development/JRP/Dev/birt/org.eclipse.birt.report.data.oda.jdbc/jdbc-drivers" />
-		</copy>
-		<!-- <copy todir="${p4.home}/CvsDiff" overwrite="true" failonerror="true"> 
-			<fileset dir="${p4.workspace}/Development/JRP/Dev/build/cvsDiff"/> </copy> -->
-		<copy todir="${p4.home}/../PackageFiles/template" overwrite="true"
-			failonerror="true">
-			<fileset dir="${p4.workspace}/Development/JRP/Dev/build/script/template">
-				<include name="**" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="backupSrc">
-	</target>
-
-	<target name="cleanBuild">
-
-		<echo message="clean up last input under ${buildDirectory} ..." />
-		<delete failonerror="false" includeemptydirs="true">
-			<fileset dir="${buildDirectory}">
-				<include name="*.properties" />
-				<include name="*.txt" />
-				<include name="*.xml" />
-				<include name="plugins/**" />
-				<include name="features/**" />
-				<include name="maps/source" />
-			</fileset>
-		</delete>
-		<delete failonerror="false" includeemptydirs="true">
-			<fileset dir="${p4.home}">
-				<include name="source/**" />
-				<include name="CvsResult/*.xml" />
-				<include name="CvsResult/DaysInPast/*.xml" />
-			</fileset>
-		</delete>
-	</target>
-
-	<target name="init">
-		<echo message="loading ${eclipse.build.configs}/../../build.properties ..." />
-		<property file="${eclipse.build.configs}/../../build.properties" />
-		<echo message="loading ${dtp.repository}/monitor.properties ..." />
-		<property file="${dtp.repository}/monitor.properties" />
-		<condition property="Compile.Error">
-			<equals arg1="${compileHasError}" arg2="true" />
-		</condition>
-	</target>
-
-	<target name="getDTPDownloads.fromlocal" depends="init" unless="Compile.Error">
-
-		<property name="plugin-dest" value="${baseLocation}" />
-		<property name="package-dest" value="${baseLocation}/../PackageFiles" />
-		<property name="epp-dest" value="${baseLocation}/../PackageFiles/epp" />
-		<property name="epp-linux-dest" value="${baseLocation}/../PackageFiles/epp-linux" />
-		<property name="file-version" value="${file-prefix}${timestamp}" />
-		<property file="${dtp.repository}/monitor.properties" />
-
-		<copy tofile="${postingDirectory}/../platform/DTP/${file-version}.zip"
-			file="${dtp.repository}/${buildId}/${file-version}.zip" />
-		<unzip src="${postingDirectory}/../platform/DTP/${file-version}.zip"
-			dest="${p4.home}/downloads/${file-version}" />
-
-		<antcall target="checkDTPVersion" />
-		<echo message="Clean last download stuff" />
-		<delete includeemptydirs="true" failonerror="false">
-			<fileset dir="${plugin-dest}/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.eclipse.datatools.*/**" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${plugin-dest}/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-			<fileset dir="${package-dest}/dtp/eclipse/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.eclipse.datatools.*/**" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${package-dest}/dtp/eclipse/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-			<fileset dir="${package-dest}/jee/eclipse/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${package-dest}/jee/eclipse/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-linux/eclipse/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-linux/eclipse/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-x86_64/eclipse/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-x86_64/eclipse/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-mac/eclipse/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-mac/eclipse/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-		</delete>
-
-		<!--Define the ODA dependency plugins -->
-		<patternset id="oda.runtime.plugins">
-			<include name="org.eclipse.datatools.connectivity_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.ui.dse_*.jar" />
-			<include name="org.eclipse.datatools.doc.user_*/**" />
-			<include name="org.eclipse.datatools.connectivity.oda.consumer_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.design.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.design_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.flatfile.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.flatfile_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.profile_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda_*.jar" />
-			<include
-				name="org.eclipse.datatools.connectivity.oda.designer.finfo_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.finfo_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.template.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.xml_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.xml.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.designer.finfo_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.finfo_*.jar" />
-			<include name="org.eclipse.datatools.oda.cshelp_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.ws.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.ws_*.jar" />
-			<include name="org.eclipse.datatools.help_*.jar" />
-			<include name="org.eclipse.datatools.doc.isv_*.jar" />
-			<include name="org.apache.xerces_*.jar" />
-			<include name="org.apache.xml.resolver_*.jar" />
-			<include name="javax.xml_*.jar" />
-			<include name="org.apache.xml.serializer_*.jar" />
-			<include name="javax.wsdl_*.jar" />
-			<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-		</patternset>
-		<patternset id="oda.runtime.features">
-			<include
-				name="org.eclipse.datatools.connectivity.oda.designer.feature_*/**" />
-			<include name="org.eclipse.datatools.connectivity.oda.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.oda.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.oda.designer.feature_*/**" />
-			<include name="org.eclipse.datatools.doc.user_*/**" />
-		</patternset>
-		<patternset id="jee.dtp.plugins">
-			<include name="org.apache.xerces_*.jar" />
-			<include name="org.apache.xml.resolver_*.jar" />
-			<include name="javax.wsdl_*.jar" />
-			<include name="javax.xml_*.jar" />
-			<include name="org.apache.xml.serializer_*.jar" />
-			<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			<include name="org.eclipse.datatools.connectivity_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.apache.derby_*.jar" />
-			<include
-				name="org.eclipse.datatools.connectivity.apache.derby.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.apache.derby.ui_*.jar" />
-			<include
-				name="org.eclipse.datatools.connectivity.dbdefinition.genericJDBC_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.db.generic_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.db.generic.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.consumer_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.design_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.design.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.flatfile_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.flatfile.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.profile_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.template.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.sqm.core_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.sqm.core.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.sqm.server.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.ui.dse_*.jar" />
-			<include name="org.eclipse.datatools.doc.user_*.jar" />
-			<include name="org.eclipse.datatools.enablement.finfo_*.jar" />
-			<include name="org.eclipse.datatools.enablement.hsqldb_*.jar" />
-			<include name="org.eclipse.datatools.enablement.hsqldb.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.hsqldb.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.iseries_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.iseries.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.luw_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.luw.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.zseries_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.zseries.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.informix_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.ibm.informix.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.informix.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.msft.sqlserver_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.msft.sqlserver.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.mysql_*.jar" />
-			<include name="org.eclipse.datatools.enablement.mysql.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.mysql.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.ws_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.ws.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.xml_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.xml.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oracle_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oracle.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oracle.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.postgresql_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.postgresql.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.postgresql.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sap.maxdb_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.sap.maxdb.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sap.maxdb.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.asa_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.ase_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.asa.models_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.ase.models_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.sybase.asa.dbdefinition_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.sybase.ase.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.ase.profile_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.asa.profile_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.asa.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.ase.ui_*.jar" />
-			<include name="org.eclipse.datatools.help_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.derby_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.sql_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.sql.edit_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.sql.query_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.sql.query.edit_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.sql.xml.query_*.jar" />
-			<include name="org.eclipse.datatools.oda.cshelp_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.common.ui_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.data.core_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.data.ui_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.db.derby_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.db.generic_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.ddlgen.ui_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.debugger.core_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.editor.core_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.parsers.sql_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.parsers.sql.lexer_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.parsers.sql.query_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.parsers.sql.xml.query_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.plan_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.result_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.routineeditor_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.sql_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.sqlbuilder_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.sqleditor_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.sqlscrapbook_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.tabledataeditor_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.tablewizard_*.jar" />
-		</patternset>
-		<patternset id="jee.dtp.features">
-			<include name="org.eclipse.datatools.connectivity.feature_*/**" />
-			<include
-				name="org.eclipse.datatools.connectivity.oda.designer.feature_*/**" />
-			<include name="org.eclipse.datatools.connectivity.oda.feature_*/**" />
-			<include name="org.eclipse.datatools.doc.user_*/**" />
-			<include name="org.eclipse.datatools.enablement.apache.derby.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.hsqldb.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.ibm.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.jdbc.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.msft.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.mysql.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.oda.designer.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.oda.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.oracle.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.postgresql.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.sap.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.sybase.feature_*/**" />
-			<include name="org.eclipse.datatools.modelbase.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.data.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.ddl.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.ddlgen.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.parsers.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.results.feature_*/**" />
-		</patternset>
-
-		<!-- Copy to static baseLocation -->
-		<copy todir="${plugin-dest}/plugins" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-		<copy todir="${plugin-dest}/features" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<!-- Copy to package files dir -->
-		<copy todir="${package-dest}/dtp/eclipse/plugins" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/dtp/eclipse/features" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-		<!-- copy to jee(-linux) dir -->
-		<copy todir="${package-dest}/jee/eclipse/plugins" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee/eclipse/features" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee-x86_64/eclipse/plugins" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee-x86_64/eclipse/features" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-		
-		<copy todir="${package-dest}/jee-linux/eclipse/plugins"
-			failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee-linux/eclipse/features"
-			failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee-mac/eclipse/plugins"
-			failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee-mac/eclipse/features"
-			failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<delete dir="${p4.home}/downloads/${file-version}"
-			includeemptydirs="true" />
-	</target>
-
-	<target name="getDTPDownloads" depends="init">
-
-		<tstamp prefix="timestamp">
-			<format property="TODAY_US" pattern="yyyyMMdd" timezone="GMT-16" />
-			<format property="TODAY_SH" pattern="yyyyMMdd" />
-		</tstamp>
-
-		<property name="plugin-dest" value="${baseLocation}" />
-		<property name="package-dest" value="${baseLocation}/../PackageFiles" />
-		<property name="AllInOne-dest" value="${baseLocation}/../PackageFiles/AllInOne" />
-		<property name="AllInOne-Linux-dest"
-			value="${baseLocation}/../PackageFiles/AllInOne-Linux" />
-
-		<get src="${dtpURL}" dest="${postingDirectory}/../platform/DTP/${file-version}.zip"
-			verbose="true" usetimestamp="true" />
-
-		<antcall target="checkDTPVersion" />
-
-		<echo message="START to Unzip the downloaded Plugins files" />
-		<unzip src="${postingDirectory}/../platform/DTP/${file-version}.zip"
-			dest="${p4.home}/downloads/${file-version}" />
-
-		<echo message="Clean last download stuff" />
-		<delete includeemptydirs="true" failonerror="false">
-			<fileset dir="${plugin-dest}/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.eclipse.datatools.*/**" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${plugin-dest}/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-			<fileset dir="${package-dest}/dtp/eclipse/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.eclipse.datatools.*/**" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${package-dest}/dtp/eclipse/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-			<fileset dir="${package-dest}/jee/eclipse/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${package-dest}/jee/eclipse/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-linux/eclipse/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-linux/eclipse/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-x86_64/eclipse/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-x86_64/eclipse/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-mac/eclipse/plugins">
-				<include name="*.datatools.*.jar" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-				<include name="javax.wsdl_1.4.0*.jar" />
-				<include name="javax.xml_*.jar" />
-				<include name="org.apache.xml.serializer_*.jar" />
-				<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			</fileset>
-			<fileset dir="${package-dest}/jee-mac/eclipse/features">
-				<include name="org.eclipse.datatools.*/**" />
-			</fileset>			
-		</delete>
-
-		<!--Define the ODA dependency plugins -->
-		<patternset id="oda.runtime.plugins">
-			<include name="org.eclipse.datatools.connectivity_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.ui.dse_*.jar" />
-			<include name="org.eclipse.datatools.doc.user_*/**" />
-			<include name="org.eclipse.datatools.connectivity.oda.consumer_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.design.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.design_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.flatfile.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.flatfile_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.profile_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda_*.jar" />
-			<include
-				name="org.eclipse.datatools.connectivity.oda.designer.finfo_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.finfo_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.template.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.xml_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.xml.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.designer.finfo_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.finfo_*.jar" />
-			<include name="org.eclipse.datatools.oda.cshelp_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.ws.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.ws_*.jar" />
-			<include name="org.eclipse.datatools.help_*.jar" />
-			<include name="org.eclipse.datatools.doc.isv_*.jar" />
-			<include name="org.apache.xerces_*.jar" />
-			<include name="org.apache.xml.resolver_*.jar" />
-			<include name="javax.xml_*.jar" />
-			<include name="org.apache.xml.serializer_*.jar" />
-			<include name="javax.wsdl_*.jar" />
-			<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-		</patternset>
-		<patternset id="oda.runtime.features">
-			<include
-				name="org.eclipse.datatools.connectivity.oda.designer.feature_*/**" />
-			<include name="org.eclipse.datatools.connectivity.oda.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.oda.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.oda.designer.feature_*/**" />
-			<include name="org.eclipse.datatools.doc.user_*/**" />
-		</patternset>
-		<patternset id="jee.dtp.plugins">
-			<include name="org.apache.xerces_*.jar" />
-			<include name="org.apache.xml.resolver_*.jar" />
-			<include name="javax.wsdl_*.jar" />
-			<include name="javax.xml_*.jar" />
-			<include name="org.apache.xml.serializer_*.jar" />
-			<include name="net.sourceforge.lpg.lpgjavaruntime_*.jar" />
-			<include name="org.eclipse.datatools.connectivity_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.apache.derby_*.jar" />
-			<include
-				name="org.eclipse.datatools.connectivity.apache.derby.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.apache.derby.ui_*.jar" />
-			<include
-				name="org.eclipse.datatools.connectivity.dbdefinition.genericJDBC_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.db.generic_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.db.generic.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.consumer_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.design_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.design.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.flatfile_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.flatfile.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.profile_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.template.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.sqm.core_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.sqm.core.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.sqm.server.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.ui_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.ui.dse_*.jar" />
-			<include name="org.eclipse.datatools.doc.user_*.jar" />
-			<include name="org.eclipse.datatools.enablement.finfo_*.jar" />
-			<include name="org.eclipse.datatools.enablement.hsqldb_*.jar" />
-			<include name="org.eclipse.datatools.enablement.hsqldb.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.hsqldb.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.iseries_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.iseries.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.luw_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.luw.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.zseries_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.zseries.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.informix_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.ibm.informix.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.informix.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.msft.sqlserver_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.msft.sqlserver.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.mysql_*.jar" />
-			<include name="org.eclipse.datatools.enablement.mysql.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.mysql.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.ws_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.ws.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.xml_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.xml.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oracle_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oracle.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oracle.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.postgresql_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.postgresql.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.postgresql.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sap.maxdb_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.sap.maxdb.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sap.maxdb.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.asa_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.ase_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.asa.models_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.ase.models_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.sybase.asa.dbdefinition_*.jar" />
-			<include
-				name="org.eclipse.datatools.enablement.sybase.ase.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.ase.profile_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.asa.profile_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.asa.ui_*.jar" />
-			<include name="org.eclipse.datatools.enablement.sybase.ase.ui_*.jar" />
-			<include name="org.eclipse.datatools.help_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.derby_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.sql_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.sql.edit_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.sql.query_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.sql.query.edit_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.sql.xml.query_*.jar" />
-			<include name="org.eclipse.datatools.oda.cshelp_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.common.ui_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.data.core_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.data.ui_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.db.derby_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.db.generic_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.ddlgen.ui_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.debugger.core_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.editor.core_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.parsers.sql_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.parsers.sql.lexer_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.parsers.sql.query_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.parsers.sql.xml.query_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.plan_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.result_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.routineeditor_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.sql_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.sqlbuilder_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.sqleditor_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.sqlscrapbook_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.tabledataeditor_*.jar" />
-			<include name="org.eclipse.datatools.sqltools.tablewizard_*.jar" />
-		</patternset>
-		<patternset id="jee.dtp.features">
-			<include name="org.eclipse.datatools.connectivity.feature_*/**" />
-			<include
-				name="org.eclipse.datatools.connectivity.oda.designer.feature_*/**" />
-			<include name="org.eclipse.datatools.connectivity.oda.feature_*/**" />
-			<include name="org.eclipse.datatools.doc.user_*/**" />
-			<include name="org.eclipse.datatools.enablement.apache.derby.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.hsqldb.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.ibm.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.jdbc.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.msft.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.mysql.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.oda.designer.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.oda.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.oracle.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.postgresql.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.sap.feature_*/**" />
-			<include name="org.eclipse.datatools.enablement.sybase.feature_*/**" />
-			<include name="org.eclipse.datatools.modelbase.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.data.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.ddl.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.ddlgen.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.parsers.feature_*/**" />
-			<include name="org.eclipse.datatools.sqldevtools.results.feature_*/**" />
-		</patternset>
-
-		<!-- Copy to static baseLocation -->
-		<copy todir="${plugin-dest}/plugins" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-		<copy todir="${plugin-dest}/features" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<!-- Copy to package files dir -->
-		<copy todir="${package-dest}/dtp/eclipse/plugins" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/dtp/eclipse/features" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-		<!-- copy to jee(-linux) dir -->
-		<copy todir="${package-dest}/jee/eclipse/plugins" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee/eclipse/features" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee-x86_64/eclipse/plugins" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee-x86_64/eclipse/features" failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-		
-		<copy todir="${package-dest}/jee-linux/eclipse/plugins"
-			failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee-linux/eclipse/features"
-			failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee-mac/eclipse/plugins"
-			failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/plugins">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<copy todir="${package-dest}/jee-mac/eclipse/features"
-			failonerror="false">
-			<fileset dir="${p4.home}/downloads/${file-version}/eclipse/features">
-				<include name="**" />
-			</fileset>
-		</copy>
-
-		<delete dir="${p4.home}/downloads/${file-version}"
-			includeemptydirs="true" />
-	</target>
-
-	<!-- Build BIRT Web Viewer -->
-	<target name="BuildWebViewer" depends="init">
-
-		<antcall target="BuildWebViewer_NonOSGI" />
-
-		<antcall target="BuildWebViewer_OSGI" />
-
-	</target>
-
-	<target name="BuildWebViewer_NonOSGI">
-
-		<mkdir dir="${buildDirectory}/${buildId}/birt_web" />
-		<ant antfile="WebViewerPackager.xml"
-			dir="${buildDirectory}/plugins/org.eclipse.birt.report.viewer"
-			target="Jar">
-			<property name="integrate.dir" value="${buildDirectory}/${buildId}/eclipse" />
-			<property name="baseLocation.emf" value="${baseLocation.emf}" />
-		</ant>
-		<ant antfile="WebViewerPackager.xml"
-			dir="${buildDirectory}/plugins/org.eclipse.birt.report.viewer"
-			target="Export">
-			<property name="export.dir" value="${buildDirectory}/${buildId}/birt_web" />
-		</ant>
-
-	</target>
-
-	<target name="BuildWebViewer_OSGI" if="build.runtimeOSGI">
-
-		<mkdir dir="${buildDirectory}/${buildId}/birt_web_OSGI" />
-		<ant antfile="WebViewerPackager.xml"
-			dir="${buildDirectory}/plugins/org.eclipse.birt.report.viewer"
-			target="Jar_OSGI">
-			<property name="integrate.dir" value="${buildDirectory}/${buildId}/eclipse" />
-			<property name="baseLocation.emf" value="${baseLocation.emf}" />
-		</ant>
-		<ant antfile="WebViewerPackager.xml"
-			dir="${buildDirectory}/plugins/org.eclipse.birt.report.viewer"
-			target="Export_OSGI">
-			<property name="export.dir" value="${buildDirectory}/${buildId}/birt_web_OSGI" />
-		</ant>
-		<copy
-			todir="${buildDirectory}/${buildId}/birt_web_OSGI/org.eclipse.birt.report.viewer/birt_web_OSGI/WEB-INF/lib">
-			<fileset dir="${buildDirectory}/${buildId}/eclipse/plugins">
-				<include name="org.eclipse.birt.chart.engine_.*.jar" />
-			</fileset>
-			<mapper type="regexp" from="org.eclipse.birt.chart.engine_.*.jar"
-				to="chartengineapi.jar" />
-		</copy>
-
-	</target>
-
-	<target name="runBirtPerformance" depends="init">
-		<ant dir="${runner.dir}" antfile="testRunner.xml"
-			target="org.eclipse.birt.test.performance" />
-		<!-- copy performance result to public test result dir -->
-		<property file="${buildDirectory}/finalPluginsVersions.properties" />
-		<copy todir="${test.dir}/unitTestReport/html">
-			<fileset
-				dir="${test.dir}/eclipse/plugins/org.eclipse.birt.test.performance_${org.eclipse.birt.test.performance}">
-				<include name="reporting_*.xml" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="runBirtTest" depends="init,prepareBirtTest">
-		<!-- call the birt unit test -->
-		<ant dir="${runner.dir}" antfile="testRunner.xml" />
-		<antcall target="transformTestReports" />
-	</target>
-
-	<target name="prepareBirtTest" depends="init">
-		<!-- Clean last test plugins -->
-		<delete includeEmptyDirs="true" failonerror="false">
-			<fileset dir="${test.dir}/eclipse">
-				<include name="**/*" />
-			</fileset>
-		</delete>
-		<!-- clean last unit test reports -->
-		<delete failonerror="false">
-			<fileset dir="${test.dir}/unitTestReport">
-				<include name="**/*.xml" />
-				<include name="**/*.html" />
-				<exclude name="**/build.xml" />
-			</fileset>
-		</delete>
-		<!-- prepare unit test components -->
-		<copy todir="${test.dir}">
-			<fileset dir="${postingDirectory}/${buildId}">
-				<include
-					name="birt-report-designer-all-in-one-${package.version}-${build.date}-linux-gtk.tar.gz" />
-				<include name="birt-tests-suite-${package.version}-${build.date}.zip" />
-			</fileset>
-		</copy>
-
-		<exec executable="gunzip" dir="${test.dir}">
-			<arg
-				line="birt-report-designer-all-in-one-${package.version}-${build.date}-linux-gtk.tar.gz" />
-		</exec>
-		<exec executable="tar" dir="${test.dir}">
-			<arg
-				line="-xvf birt-report-designer-all-in-one-${package.version}-${build.date}-linux-gtk.tar" />
-		</exec>
-		<exec executable="unzip" dir="${test.dir}">
-			<arg
-				line="-o -q birt-tests-suite-${package.version}-${build.date}.zip -d ${test.dir}" />
-		</exec>
-		<exec executable="unzip"
-			dir="${postingDirectory}/../../platform/${test.framework.dir}">
-			<arg line="-o -q ${test.framework.name} -d ${test.dir}" />
-		</exec>
-		<delete>
-			<fileset dir="${test.dir}">
-				<include name="*.zip" />
-				<include name="*.gz" />
-				<include name="*.tar" />
-			</fileset>
-		</delete>
-
-		<!-- copy drivers for jdbc testing -->
-		<property file="${buildDirectory}/finalPluginsVersions.properties" />
-		<copy
-			todir="${test.dir}/eclipse/plugins/org.eclipse.birt.report.data.oda.jdbc_${org.eclipse.birt.report.data.oda.jdbc}/drivers">
-			<fileset dir="${p4.home}/drivers">
-				<include name="**" />
-			</fileset>
-		</copy>
-	</target>
-
-
-
-	<target name="transformTestReports">
-		<property file="${buildDirectory}/finalPluginsVersions.properties" />
-		<copy todir="${test.dir}/unitTestReport/smokexml">
-			<fileset
-				dir="${test.dir}/eclipse/plugins/org.eclipse.birt.report.tests.engine_${org.eclipse.birt.report.tests.engine}">
-				<include name="TESTS-*.xml" />
-			</fileset>
-			<fileset
-				dir="${test.dir}/eclipse/plugins/org.eclipse.birt.tests.data_${org.eclipse.birt.tests.data}">
-				<include name="TESTS-*.xml" />
-			</fileset>
-		</copy>
-		<!-- XSLT trasform -->
-		<exec executable="${test.dir}/unitTestReport/processXML.sh" />
-		<ant dir="${test.dir}/unitTestReport" antfile="build.xml" />
-		<mkdir
-			dir="${postingDirectory}/../../unitTestReport/${package.version}/${buildId}" />
-		<copy
-			todir="${postingDirectory}/../../unitTestReport/${package.version}/${buildId}"
-			overwrite="true">
-			<fileset dir="${test.dir}/unitTestReport/html">
-				<include name="*.html" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="buildLanguagePack">
-		<antcall target="PrePackageNLPack1" />
-		<antcall target="PackageNLPack1" />
-	</target>
-	<target name="PrePackageNLPack1">
-		<echo message="Prepare NL1 Package" />
-		<mkdir dir="${buildDirectory}/${buildId}/language_pack" />
-		<unzip
-			src="${buildDirectory}/${buildId}/birt-all-nl-${package.version}.zip"
-			dest="${buildDirectory}/${buildId}/language_pack" />
-		<ant antfile="LanguagePackBuild.xml" dir="${eclipse.build.configs}/birt.nl/tools"
-			target="compileFeatureOverlay" inheritAll="true" />
-		<ant antfile="LanguagePackBuild.xml" dir="${eclipse.build.configs}/birt.nl/tools"
-			target="exportFeatureOverlay" inheritAll="true" />
-	</target>
-
-	<target name="PackageNLPack1">
-		<echo message="Start Packaging NL1 for full, framework and RCP" />
-		<ant antfile="BIRTDownloadSetup.xml" target="createNLGroup1"
-			dir="${eclipse.build.configs}/birt/tools" inheritAll="false">
-			<property name="deposit" value="${buildDirectory}/${buildId}" />
-			<property name="OutputDir" value="${postingDirectory}/${buildId}" />
-		</ant>
-		<echo message="Start Packaging NL1 for charts" />
-		<ant antfile="BIRTDownloadSetup.xml" target="createNLGroup1Chart"
-			dir="${eclipse.build.configs}/birt/tools" inheritAll="false">
-			<property name="deposit" value="${buildDirectory}/${buildId}" />
-			<property name="OutputDir" value="${postingDirectory}/${buildId}" />
-		</ant>
-		<echo message="Start Packaging NL1 for runtime" />
-		<ant antfile="BIRTDownloadSetup.xml" target="createNLGroup1Runtime"
-			dir="${eclipse.build.configs}/birt/tools" inheritAll="false">
-			<property name="deposit" value="${buildDirectory}/${buildId}" />
-			<property name="OutputDir" value="${postingDirectory}/${buildId}" />
-		</ant>
-		<!-- Create NL FeatureOverlay packages -->
-		<ant antfile="BIRTDownloadSetup.xml" dir="${eclipse.build.configs}/birt/tools"
-			target="createBirtNLFeatureOverlay">
-			<property name="OutputDir" value="${postingDirectory}/${buildId}" />
-			<property name="deposit" value="${buildDirectory}/${buildId}" />
-		</ant>
-	</target>
-
-	<target name="getBuildMachine">
-		<condition property="fetchTag" value="HEAD">
-			<equals arg1="${buildType}" arg2="N" />
-		</condition>
-	</target>
-
-	<target name="checkOS">
-		<property environment="env" />
-
-		<condition property="hostname" value="${env.HOSTNAME}">
-			<equals arg1="${osgi.os}" arg2="linux" />
-		</condition>
-
-		<condition property="hostname" value="${env.USERDOMAIN}">
-			<equals arg1="${osgi.os}" arg2="win32" />
-		</condition>
-
-	</target>
-
-	<target name="InformQA" depends="checkOS">
-		<property file="${eclipse.build.configs}/../../config.properties" />
-		<echo>INFO: Today's build (BuildId: ${buildId}) is available.</echo>
-		<!-- create download info file -->
-		<echo file="${eclipse.build.configs}/../../download.properties"
-			append="false">
-			allInOne=\\${QA.test.dir}\\BIRT3.7-download\\${BranchVersion}\\${buildId}\\birt-report-designer-all-in-one-${package.version}.zip
-			runtime=\\${QA.test.dir}\\BIRT3.7-download\\${BranchVersion}\\${buildId}\\birt-runtime-${package.version}.zip
-			rcp=\\${QA.test.dir}\\BIRT3.7-download\\${BranchVersion}\\${buildId}\\birt-rcp-report-designer-${package.version}.zip
-			frameworkSDK=\\${QA.test.dir}\\BIRT3.7-download\\${BranchVersion}\\${buildId}\\birt-report-framework-sdk-${package.version}.zip
-		</echo>
-		<copy tofile="${postingDirectory}/download.properties" file="${eclipse.build.configs}/../../download.properties"
-			overwrite="true" />
-	</target>
-
-	<target name="InformPerformance" unless="nomail">
-		<property file="${eclipse.build.configs}/../../config.properties" />
-	</target>
-
-
-	<target name="genTestResultSummary">
-		<property file="${eclipse.build.configs}/../../config.properties" />
-		<path id="customjar.classpath">
-			<path
-				location="${eclipse.build.configs}/../../extras/org.eclipse.birt.build_2.2.0.jar" />
-			<fileset dir="${eclipse.build.configs}/../../extras/">
-				<include name="*.jar" />
-			</fileset>
-		</path>
-		<!-- Using custom build tools to get failure/error summary of test result -->
-		<java classname="org.eclipse.birt.build.ParseResultCount">
-			<classpath refid="customjar.classpath" />
-			<arg value="${test.dir}/unitTestReport/xml" />
-			<arg value="${test.dir}/unitTestReport/html/result.properties" />
-			<arg value="Y" />
-			<arg value="Y" />
-		</java>
-
-		<move file="${test.dir}/unitTestReport/html/result.properties"
-			tofile="${postingDirectory}/result.properties" />
-	</target>
-
-	<target name="InformAutomation" unless="nomail">
-		<exec executable="${ant.dir}/ant" failifexecutionfails="false">
-			<arg
-				line="-f ${eclipse.build.configs}/../helper.xml -propertyfile ${postingDirectory}/monitor.properties -propertyfile ${eclipse.build.configs}/../../build.properties informautomation" />
-		</exec>
-	</target>
-
-	<target name="informautomation">
-		<property file="${eclipse.build.configs}/../../config.properties" />
-	</target>
-
-	<target name="getDTPVersionProperty">
-		<tstamp prefix="timestamp">
-			<format property="TODAY_US" pattern="yyyyMMdd" timezone="GMT-16" />
-			<format property="TODAY_SH" pattern="yyyyMMdd" />
-		</tstamp>
-		<echo message="getDTPVersionProperty: currentDay = ${currentDay}" />
-		<condition property="latest.dtp.version" value="true">
-			<equals arg1="${timestamp.TODAY_SH}" arg2="${currentDay}" />
-		</condition>
-	</target>
-
-	<target name="checkDTPVersion" depends="getDTPVersionProperty"
-		unless="latest.dtp.version">
-		<echo>WARNING: The installed DTP build is not the latest version.</echo>
-	</target>
-
-
-	<target name="checkErrorExist">
-		<property file="${eclipse.build.configs}/../../monitor.properties" />
-		<condition property="has.compile.error" value="true">
-			<equals arg1="${compileHasError}" arg2="true" />
-		</condition>
-	</target>
-
-	<target name="checkCompileError" depends="checkErrorExist" if="has.compile.error">
-		<exec executable="${ant.dir}/ant" failifexecutionfails="false">
-			<arg
-				line="-f ${eclipse.build.configs}/../helper.xml -propertyfile ${eclipse.build.configs}/../../build.properties checkcompileerror" />
-		</exec>
-	</target>
-
-	<target name="checkcompileerror">
-		<property file="${eclipse.build.configs}/../../config.properties" />
-		<property file="${eclipse.build.configs}/../../monitor.properties" />
-		<echo>ERROR: Compile errors are found in today's BIRT build(BuildId: ${buildId}).</echo>
-	</target>
-
-	<target name="generateCompileSummary" unless="HQ.BIRT.skip">
-
-		<property file="config.properties" />
-		<property name="compile.log.summary"
-			value="${postingDirectory}/compileSummary.properties" />
-
-		<path id="customjar.classpath">
-			<fileset dir="${eclipse.build.configs}/../../extras/">
-				<include name="*.jar" />
-			</fileset>
-		</path>
-
-		<delete file="${compile.log.summary}" failonerror="false" />
-		<!-- Using custom build tools to get failure/error summary of test result -->
-		<java classname="org.eclipse.birt.build.ParseCompileSummary">
-			<classpath refid="customjar.classpath" />
-			<arg value="${postingDirectory}/${buildId}/compilelogs/plugins" />
-			<arg value="${compile.log.summary}" />
-			<arg value="Y" />
-			<arg value="Y" />
-		</java>
-	</target>
-
-	<target name="NoDiskSpace">
-		<property file="${eclipse.build.configs}/../../config.properties" />
-		<echo>ERROR: No enough disk space for build, build has been stopped.</echo>
-	</target>
-
-	<target name="DiskSpaceWarning">
-		<property file="${eclipse.build.configs}/../../config.properties" />
-		<echo>WARNING: Disk space usage of build server is less than 7GB.</echo>
-	</target>
-
-	<target name="ThirdPartyJarCheckNotification" if="CheckThirdpartylog">
-		<property file="${eclipse.build.configs}/../../config.properties" />
-		<echo>ERROR: ThirdPartyJars matching failed.</echo>
-	</target>
-
-	<target name="InformNoSign" if="CompareSignPack2">
-		<property file="${eclipse.build.configs}/../../config.properties" />
-		<echo>ERROR: ${target.dir}/${target.name} hasn't been signed.</echo>
-	</target>
-
-</project>
diff --git a/build/org.eclipse.birt.releng.birtbuilder/extras/DiskSpaceCheck.sh b/build/org.eclipse.birt.releng.birtbuilder/extras/DiskSpaceCheck.sh
deleted file mode 100755
index 58490b2139b..00000000000
--- a/build/org.eclipse.birt.releng.birtbuilder/extras/DiskSpaceCheck.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#Disk Space Check srcipt before build
-#if available size < 2097152 KB (2 GB = 1024 * 1024 *2), send build cancel notification
-#if available size < 7340032 KB (7 GB = 1024 * 1024 *7), send disk warning notification
-
-export DiskUse=`df -P | awk '{print $4}' | sed -n '2p'`
-if [ ${DiskUse} -lt 2097152 ]
-then
-  ant -f $builderDir/eclipse/helper.xml NoDiskSpace 
-  exit
-elif [ ${DiskUse} -lt 7340032 ]
-then
- ant -f $builderDir/eclipse/helper.xml DiskSpaceWarning 
-fi
-
diff --git a/chart/org.eclipse.birt.chart.integration.wtp.ui/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.integration.wtp.ui/META-INF/MANIFEST.MF
index 3419881c392..da14ce377cd 100644
--- a/chart/org.eclipse.birt.chart.integration.wtp.ui/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.integration.wtp.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.integration.wtp.ui;singleton:=true
 Bundle-Version: 4.17.0.qualifier
-Bundle-ClassPath: chartwtp.jar,.
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.chart.integration.wtp.ui.ChartWTPUIPlugin
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/chart/org.eclipse.birt.chart.integration.wtp.ui/build.properties b/chart/org.eclipse.birt.chart.integration.wtp.ui/build.properties
index e5991cc7030..97442c68d76 100644
--- a/chart/org.eclipse.birt.chart.integration.wtp.ui/build.properties
+++ b/chart/org.eclipse.birt.chart.integration.wtp.ui/build.properties
@@ -10,18 +10,17 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                icons/,\
-               chartwtp.jar,\
                templates/,\
                runtime/,\
                plugin.xml,\
                plugin.properties,\
                about.html,\
                schema/
-jars.compile.order = chartwtp.jar
-source.chartwtp.jar = src/
-output.chartwtp.jar = target/classes/
 src.includes = about.html,\
                schema/
 
diff --git a/chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF
index 5108db6f315..123537915a6 100644
--- a/chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.tests;singleton:=true
 Bundle-Version: 4.17.0.qualifier
-Bundle-ClassPath: charttests.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.chart.tests.TestsPlugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.birt.chart.tests,
diff --git a/chart/org.eclipse.birt.chart.tests/build.properties b/chart/org.eclipse.birt.chart.tests/build.properties
index 1646244af66..c15000c2666 100644
--- a/chart/org.eclipse.birt.chart.tests/build.properties
+++ b/chart/org.eclipse.birt.chart.tests/build.properties
@@ -10,12 +10,12 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
+bin.includes = .,\
+               META-INF/,\
                about.html,\
                readme.html,\
-               charttests.jar,\
                test.xml,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-output.charttests.jar = target/classes/
-source.charttests.jar = src/
+output..= target/classes/
+source.. = src/
diff --git a/chart/org.eclipse.birt.chart.viewer/BuildChartWebViewer.xml b/chart/org.eclipse.birt.chart.viewer/BuildChartWebViewer.xml
deleted file mode 100644
index 19b8f8c878a..00000000000
--- a/chart/org.eclipse.birt.chart.viewer/BuildChartWebViewer.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0"?>
-<!--
- *************************************************************************
- * Copyright (c) 2007 Actuate Corporation.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- *
- * Contributors:
- *  Actuate Corporation  - initial API and implementation
- *  
- *************************************************************************
- *
- *  Build.xml
- *
- *  Created on 03/06/2007
- *  Build script for project org.eclipse.birt.chart.web
- *
- * 
- * The following are public targets callable by external users. 
- * 
- * "Clean" - Clean all objects created by this script. Individual project build script can not call this target; 
- * "Jar" - Compile source code and generate jar for this project.
- *          The compile dependency on other projects should be defined explicitly.
- *         eclipse.home should be passed in when Individual project build script  call this target; 
- *          the property of "failonerror" should be set true(default) when compiling source code
- * "UnitTest" - Run unit tests. This task must be called after calling Jar task, 
- *              so it needn't depend on Jar explicitly
- * "Export" - Export the project, for instance, jar files are copied to a designated folder. 
- *            this task must be called after calling Jar task, so it needn't depend on Jar explicitly
- * "ExportWAR" - Export the project as an deployable war format
- * "JavaDoc" - generate java documents
- *
- * Usage:
- *    ant [any one or more of the public targets] 
- *        -Declipse.home=<your eclipse home> 
- *        -Ddtp.home=<your DTP plugins source home>   [optional]
- *
- * Default target is "Jar".
- *
- * 
- * This script may also additional targets. These targets are private to this build script only. 
- *
- * 
- *
- * Notes:
- *  1. classpath need to be set for junit.jar
- *  2. This file now requires Ant 1.6
- *
- *
--->
-
-<project name="BIRT Chart Web Viewer" default="Jar" basedir=".">
-	<!-- set global properties for this build -->
-	<!-- Public properties, used by public targets, top level build script
-		     will pass on the value at runtime. Properties will have there default
-		     value.
-		     eclipse.home
-		     utest.report.dir
-		     javadoc.dir
-		     plugin.version 
-	-->
-	<property name="eclipse.home" location="." />
-	<property name="utest.report.dir" location="utestreports" />
-	<property name="javadoc.dir" location="docs/api" />
-	<property name="export.dir" location="export" />
-
-	<!-- Compiler properties -->
-	<property name="compilerArg" value="" />
-	<property name="compileLevel" value="1.6" />
-
-	<!-- Path properties -->
-	<property name="module.name" value="org.eclipse.birt.chart.viewer" />
-	<property name="birt.dir" value="${basedir}/WebContent" />
-	<property name="bin" value="${birt.dir}/WEB-INF/classes" />
-	<property name="jar.name" value="chart-viewer.jar" />
-	<property name="war.name" value="chart-viewer-sample.war" />
-	<property name="war.folder" value="ChartViewerSample" />
-	<property name="src" value="${basedir}/src"/>
-	<property name="integrate.dir" value="${eclipse.home}"/>
-	<property name="baseLocation" value="${eclipse.home}"/>
-	<property name="baseLocation.emf" value="${baseLocation}" />
-    <property name="buildDirectory" value="${eclipse.home}"/>
-
-	<!-- set platform related properties-->
-	<condition property="basews" value="win32">
-		<os family="windows" />
-	</condition>
-	<condition property="basews" value="gtk">
-		<not>
-			<os family="windows" />
-		</not>
-	</condition>
-
-	<!-- build init -->
-	<target name="init">
-
-	</target>
-
-	<!-- Prepare some extension and eclipse jars -->
-	<target name="extensions">
-		<echo message="copy resources from : ${integrate.dir}/plugins"/>
-		<echo message="copy resources to : ${birt.dir}/WEB-INF/lib"/>
-		
-		<copy todir="${birt.dir}/WEB-INF/lib" failonerror="true" flatten="true">
-			<fileset dir="${integrate.dir}/plugins">
-				<include name="org.eclipse.birt.core_*.jar" />
-				<include name="org.eclipse.birt.chart.engine_*.jar" />
-				<include name="org.eclipse.birt.chart.engine.extension_*.jar" />
-				<include name="org.eclipse.birt.chart.device.extension_*.jar" />
-				<include name="org.eclipse.birt.chart.device.svg_*.jar" />
-				<include name="org.eclipse.birt.chart.device.pdf_*.jar" />
-				<include name="org.eclipse.birt.chart.examples.core_*.jar"/>
-				<include name="org.mozilla.rhino_*.jar" />
-				<!-- batik.pdf has been moved to Orbit -->
-				<!--
-				<include name="org.apache.batik.pdf_*/lib/*.jar" />
-				<include name="org.apache.commons.codec_*/lib/*.jar" />
-				-->
-			</fileset>
-			<fileset dir="${baseLocation}/plugins">
-				<!-- orbit projects -->
-				<include name="com.ibm.icu_*.jar" />
-				<include name="javax.servlet_*.jar" />
-				<include name="javax.servlet.jsp_*.jar" />
-				<include name="org.apache.jasper_*.jar" />
-				<include name="org.apache.commons.logging_*.jar" />
-				<include name="org.apache.commons.el_*.jar"/>
-				<include name="org.apache.xerces_*.jar"/>
-				<include name="org.apache.xml.serializer_*.jar"/>
-				<include name="org.apache.xml.resolver_*.jar"/>
-				<include name="javax.xml_*.jar"/>
-			</fileset>
-			<fileset dir="${baseLocation.emf}/plugins">
-				<include name="org.eclipse.emf.common_*.jar" />
-				<include name="org.eclipse.emf.ecore.xmi_*.jar" />
-				<include name="org.eclipse.emf.ecore_*.jar" />
-			</fileset>
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="org.eclipse.orbit.xml-apis-ext_*.jar"/>
-				<include name="org.w3c.css.sac_*.jar"/>
-				<include name="org.w3c.dom*.jar"/>
-				<include name="org.apache.commons.codec_*.jar"/>
-				<include name="org.apache.batik.*jar"/>				
-				<exclude name="org.apache.batik.swing_*.jar"/>
-				<exclude name="org.apache.batik.extension_*.jar"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<!-- Precompile the jsp pages -->
-	<target name="precompile" depends="init,extensions" description="Precompile jsp pages.">
-		<echo message="compile bin: ${bin}"/>
-		<echo message="compile src: ${src}"/>
-
-		<mkdir dir="${bin}" />
-		<javac destdir="${bin}" source="${compileLevel}" target="${compileLevel}" executable="${jvm16_home}/bin/javac" fork="yes">
-			<classpath>
-				<fileset dir="${birt.dir}/WEB-INF/lib">
-					<include name="*.jar" />
-				</fileset>
-			</classpath>
-			<src path="${src}" />
-		</javac>
-	</target>
-
-	<!-- Compile source code and generate jar for this project-->
-	<target name="Jar" depends="precompile" description="Build jar for web API.">
-		<jar jarfile="${jar.name}" basedir="${bin}" />
-		<delete dir="${bin}" />
-	</target>
-
-	<!-- Clean up web viewer -->
-	<target name="Clean" depends="init" description="Clean the plug-in.">
-		<delete includeemptydirs="true">
-			<fileset dir="." includes="${jar.name}" />
-			<fileset dir="." includes="${war.name}" />
-		</delete>
-		<delete dir="${export.dir}" />
-		<delete dir="${javadoc.dir}" />
-	</target>
-
-	<!-- Export the project, including jar files and war files	
-					 Parameters:
-					 		- ${export.dir} target directory to put the plugin binaries
-					 		- ${plugin.version} the version of plugin exported
-	-->
-	<target name="Export" depends="Jar">
-		<property file="META-INF/MANIFEST.MF" />
-		<property name="plugin.package" value="${module.name}" />
-		<echo message="Export Chart Web Viewer version = ${Bundle-Version}" />
-
-		<copy todir="${birt.dir}/WEB-INF/lib" failonerror="false">
-			<fileset dir="." includes="${jar.name}" />
-		</copy>
-
-		<jar destfile="${export.dir}/${war.name}">
-			<fileset dir="${birt.dir}">
-				<include name="*.*" />
-				<include name="*/**" />
-				<!--
-				Sevelets cause blank page issue in WebSphere.
-				-->
-				<exclude name="**/javax.servlet_*.jar"/>
-				<exclude name="**/javax.servlet.jsp_*.jar"/>
-				<!--
-				Jasper causes classloading issue in JBoss.
-				-->
-				<exclude name="**/org.apache.jasper_*.jar"/>
-				<!--
-				Javax XML parser causes classloading issue in WebSphere/WebLogic.
-				-->
-				<exclude name="**/javax.xml_*.jar"/>
-			</fileset>
-		</jar>
-	</target>
-
-	<!-- public task UnitTest will not explicitly depend on complie, Top level script should call compile before calling UnitTest -->
-	<!-- Run Unit test.
-				 Parameters:
-				 		- ${utest.report.dir} target directory to put the unit test report
-	-->
-	<target name="UnitTest" description="run all the unit tests" />
-
-
-	<!-- Generate the JavaDoc.
-		 Parameters:
-		 		- ${javadoc.dir} target directory to put the java document
-	 -->
-	<target name="Javadoc" depends="init, extensions">
-		<mkdir dir="${javadoc.dir}" />
-		<javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="BIRT Chart Viewer Project" source="${compileLevel}" executable="${jvm16_home}/bin/javac" packagenames="${module.name}.*">
-			<classpath>
-				<fileset dir="${birt.dir}/WEB-INF/lib">
-					<include name="*.jar" />
-				</fileset>
-			</classpath>
-			<packageset dir="src" defaultexcludes="yes" />
-			<bottom>
-				<![CDATA[<i>Copyright &#169;  2007 Actuate Corp. All rights reserved. </i>]]></bottom>
-	</javadoc>
-</target>
-
-</project>
diff --git a/core/org.eclipse.birt.core.testhelper/META-INF/MANIFEST.MF b/core/org.eclipse.birt.core.testhelper/META-INF/MANIFEST.MF
index 7786b1d2a82..f19be6fee10 100644
--- a/core/org.eclipse.birt.core.testhelper/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.birt.core.testhelper/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 4.17.0.qualifier
 Fragment-Host: org.eclipse.birt.core;bundle-version="2.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.7.0";resolution:=optional;visibility:=reexport
-Bundle-ClassPath: coretesthelper.jar
+Bundle-ClassPath: .
 Export-Package: org.eclipse.birt.core.archive.compound,
  org.eclipse.birt.core.archive.cache
 Bundle-Vendor: %Bundle-Vendor
diff --git a/core/org.eclipse.birt.core.testhelper/build.properties b/core/org.eclipse.birt.core.testhelper/build.properties
index 7d978086d54..cfe40f50cb1 100644
--- a/core/org.eclipse.birt.core.testhelper/build.properties
+++ b/core/org.eclipse.birt.core.testhelper/build.properties
@@ -10,13 +10,9 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
+source.. = test/
 output.. = target/classes/
 bin.includes = META-INF/,\
-               coretesthelper.jar,\
                OSGI-INF/l10n/bundle.properties,\
                .,\
                OSGI-INF/
-jars.compile.order = coretesthelper.jar
-source.coretesthelper.jar = 
-output.coretesthelper.jar = target/classes/
-source.coretesthelper.jar = test/
diff --git a/core/org.eclipse.birt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.birt.core.tests/META-INF/MANIFEST.MF
index bbd52fb74ab..d52af169330 100644
--- a/core/org.eclipse.birt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.birt.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.core.tests;singleton:=true
-Bundle-ClassPath: coretests.jar
+Bundle-ClassPath: .
 Bundle-Version: 4.17.0.qualifier
 Bundle-Activator: org.eclipse.birt.core.Activator
 Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/core/org.eclipse.birt.core.tests/build.properties b/core/org.eclipse.birt.core.tests/build.properties
index 3aa08cf583f..ea9429078f4 100644
--- a/core/org.eclipse.birt.core.tests/build.properties
+++ b/core/org.eclipse.birt.core.tests/build.properties
@@ -10,11 +10,11 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                about.html,\
-               coretests.jar,\
                test.xml,\
                OSGI-INF/l10n/bundle.properties,\
-               OSGI-INF/
-output.coretests.jar = target/classes/
-source.coretests.jar = test/
+               OSGI-INF/
\ No newline at end of file
diff --git a/data/org.eclipse.birt.data.tests/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data.tests/META-INF/MANIFEST.MF
index b20315fed8f..d7fb0132f4c 100644
--- a/data/org.eclipse.birt.data.tests/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.data.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data.tests;singleton:=true
-Bundle-ClassPath: dataenginetests.jar
+Bundle-ClassPath: .
 Bundle-Version: 4.17.0.qualifier
 Bundle-Activator: org.eclipse.birt.data.tests.plugin.Activator
 Require-Bundle: org.eclipse.birt.data;bundle-version="4.13.0",
diff --git a/data/org.eclipse.birt.data.tests/build.properties b/data/org.eclipse.birt.data.tests/build.properties
index 8360df0a17d..426f105b809 100644
--- a/data/org.eclipse.birt.data.tests/build.properties
+++ b/data/org.eclipse.birt.data.tests/build.properties
@@ -10,12 +10,11 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-source.dataenginetests.jar = test/
-output.dataenginetests.jar = target/classes/
-bin.includes = META-INF/,\
-               dataenginetests.jar,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                test.xml,\
                about.html,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-jars.compile.order = dataenginetests.jar
diff --git a/data/org.eclipse.birt.data.tests/test/plugins/org.eclipse.birt.thirdparty.aggregation/aggregation.jar b/data/org.eclipse.birt.data.tests/test/plugins/org.eclipse.birt.thirdparty.aggregation/aggregation.jar
deleted file mode 100644
index 1eab42b29cc..00000000000
Binary files a/data/org.eclipse.birt.data.tests/test/plugins/org.eclipse.birt.thirdparty.aggregation/aggregation.jar and /dev/null differ
diff --git a/data/org.eclipse.birt.data.tests/test/plugins/org.eclipse.birt.thirdparty.aggregation/plugin.xml b/data/org.eclipse.birt.data.tests/test/plugins/org.eclipse.birt.thirdparty.aggregation/plugin.xml
index d7b857e2b44..142cf301eb0 100644
--- a/data/org.eclipse.birt.data.tests/test/plugins/org.eclipse.birt.thirdparty.aggregation/plugin.xml
+++ b/data/org.eclipse.birt.data.tests/test/plugins/org.eclipse.birt.thirdparty.aggregation/plugin.xml
@@ -19,14 +19,6 @@
    name="Aggr"
    version="1.0.1"
    provider-name="Eclipse.org">
-      <runtime>
-      <library name="aggregation.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.birt.data"/>
-   </requires>
    
    <extension
          point="org.eclipse.birt.data.aggregation">
diff --git a/data/org.eclipse.birt.data/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data/META-INF/MANIFEST.MF
index 143f31e684d..b22015e5980 100644
--- a/data/org.eclipse.birt.data/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.data/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data; singleton:=true
 Bundle-Version: 4.17.0.qualifier
-Bundle-ClassPath: library.jar,
- .
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.data.engine.plugin.DataEnginePlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/data/org.eclipse.birt.data/build.properties b/data/org.eclipse.birt.data/build.properties
index 85ce6357f86..734608f268c 100644
--- a/data/org.eclipse.birt.data/build.properties
+++ b/data/org.eclipse.birt.data/build.properties
@@ -10,7 +10,6 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-jars.compile.order = .
 source.. = src/
 output.. = target/classes/
 bin.includes = .options,\
@@ -21,7 +20,3 @@ bin.includes = .options,\
                .,\
                plugin.properties
 src.includes = about.html
-customBuildCallbacks=customBuildCallbacks.xml
-
-
-
diff --git a/data/org.eclipse.birt.data/customBuildCallbacks.xml b/data/org.eclipse.birt.data/customBuildCallbacks.xml
deleted file mode 100644
index 5570cc021d5..00000000000
--- a/data/org.eclipse.birt.data/customBuildCallbacks.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<!--
- *******************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *   See git history
- *******************************************************************************
--->
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-		<property name="basedir" location="." />
-		
-		<!-- make modelapi.jar-->
-		<echo message="make dteapi.jar"/>
-		<jar destfile="${basedir}/dteapi.jar">
-			<fileset dir="@dot">
-				<include name="org/eclipse/birt/data/engine/api/**/*.class" />
-				<exclude name="org/eclipse/birt/data/engine/api/**/*Test*.class" />
-				<include name="org/eclipse/birt/data/engine/olap/api/**/*.class" />
-				<exclude name="org/eclipse/birt/data/engine/olap/api/**/*Test*.class" />
-				<include name="javax/olap/**/*.class" />
-				<include name="org/eclipse/birt/data/engine/core/DataException.class" />
-				<include name="org/eclipse/birt/data/engine/core/security/*.class" />
-				<include name="org/eclipse/birt/data/engine/i18n/*.*" />
-				<exclude name="org/eclipse/birt/data/engine/i18n/package.html" />
-			</fileset>
-		</jar>
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="pre.name">
-	</target>
-
-	<target name="pre.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do during the compilation target <name>, after the compile   -->
-	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
-	<!-- target, eg @dot                                                       -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.compile.name">
-	</target>
-
-	<target name="post.compile.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.name">
-	</target>
-
-	<target name="post.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-	</target>
-		
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">        
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">       
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">              
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">             
-	</target>
-</project>
diff --git a/data/org.eclipse.birt.data/lib/.gitignore b/data/org.eclipse.birt.data/lib/.gitignore
deleted file mode 100644
index 96bfc1e85c5..00000000000
--- a/data/org.eclipse.birt.data/lib/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-core.jar
-db2*.jar
-derby*.jar
-
diff --git a/data/org.eclipse.birt.report.data.adapter/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.adapter/META-INF/MANIFEST.MF
index 010ce41d93d..ea3262d1c25 100644
--- a/data/org.eclipse.birt.report.data.adapter/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.adapter/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Export-Package: org.eclipse.birt.report.data.adapter,
  org.eclipse.birt.report.data.adapter.api.timeFunction,
  org.eclipse.birt.report.data.adapter.impl
 Bundle-Vendor: %Bundle-Vendor
-Bundle-ClassPath: library.jar,
- .
+Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.birt.report.data.adapter
diff --git a/data/org.eclipse.birt.report.data.adapter/build.properties b/data/org.eclipse.birt.report.data.adapter/build.properties
index b4543d8ea95..c9051ec227d 100644
--- a/data/org.eclipse.birt.report.data.adapter/build.properties
+++ b/data/org.eclipse.birt.report.data.adapter/build.properties
@@ -10,6 +10,8 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
+source.. = src/
+output.. = target/classes/
 bin.includes = .options,\
                META-INF/MANIFEST.MF,\
                about.html,\
@@ -20,8 +22,4 @@ bin.includes = .options,\
                META-INF/,\
                OSGI-INF/
 src.includes = about.html
-jars.compile.order = .
-source.. = src/
-output.. = target/classes/
-customBuildCallbacks=customBuildCallbacks.xml
 
diff --git a/data/org.eclipse.birt.report.data.adapter/customBuildCallbacks.xml b/data/org.eclipse.birt.report.data.adapter/customBuildCallbacks.xml
deleted file mode 100644
index b2b07e53f89..00000000000
--- a/data/org.eclipse.birt.report.data.adapter/customBuildCallbacks.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<!--
- *******************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *   See git history
- *******************************************************************************
--->
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-		<property name="basedir" location="." />
-		
-		<!-- make dataadapterapi.jar-->
-		<echo message="make dataadapterapi.jar"/>
-		<jar destfile="${basedir}/dataadapterapi.jar">
-			<fileset dir="@dot">
-				<include name="org/eclipse/birt/report/data/adapter/api/**/*.class" />
-				<exclude name="org/eclipse/birt/report/data/adapter/api/**/*Test*.class" />
-				<include name="org/eclipse/birt/report/data/adapter/i18n/*.*" />
-				<exclude name="org/eclipse/birt/report/data/adapter/i18n/package.html" />
-			</fileset>
-		</jar>
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="pre.name">
-	</target>
-
-	<target name="pre.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do during the compilation target <name>, after the compile   -->
-	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
-	<!-- target, eg @dot                                                       -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.compile.name">
-	</target>
-
-	<target name="post.compile.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.name">
-	</target>
-
-	<target name="post.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-	</target>
-		
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">        
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">       
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">              
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">             
-	</target>
-</project>
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.tests/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.jdbc.tests/META-INF/MANIFEST.MF
index daf5110dab9..bae0d8c66a5 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.tests/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.tests;singleton:=true
 Bundle-Version: 4.17.0.qualifier
-Bundle-ClassPath: odajdbctests.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.jdbc.plugin.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.23.0",
  org.junit;bundle-version="4.8.1",
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.tests/build.properties b/data/org.eclipse.birt.report.data.oda.jdbc.tests/build.properties
index 21625f635f9..426f105b809 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.tests/build.properties
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.tests/build.properties
@@ -10,10 +10,10 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-source.odajdbctests.jar = test/
-output.odajdbctests.jar = target/classes/
-bin.includes = META-INF/,\
-               odajdbctests.jar,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                test.xml,\
                about.html,\
                OSGI-INF/l10n/bundle.properties,\
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.jdbc/META-INF/MANIFEST.MF
index 364e632ce26..bdd2867c9b7 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.jdbc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc;singleton:=true
 Bundle-Version: 4.17.0.qualifier
-Bundle-ClassPath: oda-jdbc.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.plugin.OdaJdbcPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc/build.properties b/data/org.eclipse.birt.report.data.oda.jdbc/build.properties
index 5d047d05a08..a810a0f0fe6 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc/build.properties
+++ b/data/org.eclipse.birt.report.data.oda.jdbc/build.properties
@@ -10,10 +10,9 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-jars.compile.order = oda-jdbc.jar
-source.oda-jdbc.jar = src/
-output.oda-jdbc.jar = target/classes/
-bin.includes = oda-jdbc.jar,\
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
                .options,\
                META-INF/,\
                about.html,\
diff --git a/data/org.eclipse.birt.report.data.oda.sampledb.ui/BuildSampleDBUI.xml b/data/org.eclipse.birt.report.data.oda.sampledb.ui/BuildSampleDBUI.xml
deleted file mode 100644
index 43b8d56f942..00000000000
--- a/data/org.eclipse.birt.report.data.oda.sampledb.ui/BuildSampleDBUI.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0"?>
-<!--
- *************************************************************************
- * Copyright (c) 2004, 2005 Actuate Corporation.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- *
- * Contributors:
- *  Actuate Corporation  - initial API and implementation
- *  
- *************************************************************************
- *
- *  Build.xml
- *
- *  Build script for project org.eclipse.birt.report.data.oda.sampledb
- *
- * 
- * The following are public targets callable by external users. 
- * 
- * "Clean" - Clean all objects created by this script. Individual project build script can not call this target; 
- * "Jar" - Compile source code and generate jars for this project.
- *          The compile dependency on other projects should be defined explicitly.
- *         eclipse.home should be passed in when Individual project build script  call this target; 
- *          the property of "failonerror" should be set true(default) when compiling source code
- * "Export" - Export the project, for instance, jar files are copied to a designated folder. 
- *            this task must be called after calling Jar task, so it needn't depend on Jar explicitly
- *
- * Usage:
- *    ant [any one or more of the public targets] 
- *        -Declipse.home=<your eclipse home> 
- *
- * Default target is "Jar".
- *
- * 
- * This script may also additional targets. These targets are private to this build script only. 
- *
- * 
- *
- * Notes:
- *  1. classpath need to be set for junit.jar
- *  2. This file now requires Ant 1.6
- *
- * Change History:
- *
- *    1. 04/15/2005: initial version
- *
--->
-
-<project name="Sample Database UI" default="Jar" basedir=".">
-	<description>BIRT Sample Database UI Plugin</description>
-	<!-- set global properties for this build -->
-	<!-- Public properties, used by public targets, top level build script
-		     will pass on the value at runtime. Properties will have there default
-		     value.
-
-		     eclipse.home
-		     utest.report.dir
-		     javadoc.dir
-		     plugin.version 
-	-->
-	<property file="../birt-build.properties" /> 
-	<property name="dtp.home" location=".." />
-	
-	<!-- ===== Default value for public properties ============= -->
-	<property name="module.name" value="org.eclipse.birt.report.data.oda.sampledb.ui"/>
-	
-	<property name="export.dir" value="exports"/>
-	<property name="dir.bin" value="bin"/>
-	<property name="dir.src" value="src"/>
-	<property name="dir.utest" value="utest"/>
-	<property name="oda.designer.ui.dir" location="../org.eclipse.datatools.connectivity.oda.design.ui"/>
-	<property name="oda.designer.ui.jar" value="odadesignui.jar"/>
-	<property name="oda.connectivity.ui.dir" location="../org.eclipse.datatools.connectivity.ui"/>
-	<property name="oda.connectivity.ui.jar" value="connectivityui.jar"/>
-	<property name="oda.jdbc.dir" location="../org.eclipse.birt.report.data.oda.jdbc"/>
-	<property name="oda.jdbc.jar" value="oda-jdbc.jar"/>
-	<property name="oda.jdbc.ui.dir" location="../org.eclipse.birt.report.data.oda.jdbc.ui"/>
-	<property name="oda.jdbc.ui.jar" value="jdbcui.jar"/>
-	<property name="sampledb.dir" location="../org.eclipse.birt.report.data.oda.sampledb"/>
-	<property name="sampledb.jar" value="sampledb.jar"/>
-	<property name="plugin.jar" value="sampledbui.jar"/>
-	<property name="db.dir" value="db"/>
-	<property name="db.name" value="BirtSample"/>
-	<property name="oda.designer.dir" location="../org.eclipse.datatools.connectivity.oda.design"/>
-	<property name="oda.designer.jar" value="odadesign.jar"/>
-	
-	<path id="class.path">
-		<pathelement path="${dir.bin}" />
-
-		<fileset dir="${oda.jdbc.dir}">
-			<include name="${oda.jdbc.jar}"/>
-		</fileset>
-		<fileset dir="${oda.jdbc.ui.dir}">
-			<include name="${oda.jdbc.ui.jar}"/>
-		</fileset>
-		<fileset dir="${sampledb.dir}">
-			<include name="${sampledb.jar}"/>
-		</fileset>
-<!--	<fileset dir="${birt.core.dir}">
-			<include name="${birt.core.jar}"/>
-		</fileset>
-        <fileset dir="${oda.designer.ui.dir}">
-			<include name="${oda.designer.ui.jar}"/>
-		</fileset>
-		<fileset dir="${oda.connectivity.ui.dir}">
-			<include name="${oda.connectivity.ui.jar}" /> 
-		</fileset>
-		<fileset dir="${oda.designer.dir}">
-			<include name="${oda.designer.jar}" />
-		</fileset>
--->		<fileset dir="${eclipse.home}/plugins">
-			<include name="org.eclipse.swt*/**/swt.jar" /> 
-			<include name="org.eclipse.swt*.jar" /> 
-		</fileset>
-		<fileset dir="${eclipse.home}/plugins">
-			<include name="org.eclipse.jface*/jface.jar" /> 
-		</fileset>
-
-		<!-- dependend on eclipse due to Plugin class -->
-		<fileset dir="${eclipse.home}/plugins">
-			<include name="org.eclipse.core.runtime_*/runtime.jar"/>
-			<include name="org.eclipse.osgi_*/*.jar"/>
-			<include name="org.eclipse.core.runtime*.jar"/>
-			<include name="org.eclipse.osgi*.jar"/>
-			<include name="org.eclipse.jface_*.jar"/>
-			<include name="org.eclipse.ui*.jar"/>
-			<include name="org.eclipse.emf.ecore*.jar"/>
-			<include name="org.eclipse.emf.common*.jar"/>
-			<include name="org.eclipse.equinox.common_*.jar"/>
-			<include name="org.eclipse.datatools.connectivity*.jar"/>
-            <include name="org.eclipse.datatools.connectivity*/*.jar"/>
-		</fileset>
-		
-	</path>
-	
-
-	<!-- Compile source code and generate jar for this project.
-		 Input parameters:
-		 	eclipse.home
-
-	-->
-	<target name="Jar" depends="compileSource">
-		<jar destfile="${plugin.jar}">
-			<fileset dir="${dir.bin}">
-				<include name="**/*.class" />
-				<include name="**/*.txt" />
-				<include name="**/*.xml" />
-				<include name="**/*.def" />
-				<include name="**/*.properties" />
-				<exclude name="**/*Test.class" />
-			</fileset>
-		</jar>
-	</target>
-	
-	<!-- Export the project, for instance, jar files are copied to a designated folder
-		 the dependency on Jar should implement in top level script by call sequence	
-		 Parameters:
-		 		- ${export.dir} target directory to put the plugin binaries
-		 		- ${plugin.version} the version of plugin exported
-	 -->
-	<target name="Export">
-		<mkdir dir="${export.dir}" />
-		<property file="META-INF/MANIFEST.MF" />
-		<xmlproperty file="plugin.xml" collapseAttributes="true" />
-		<antcall target="i18n" />
-		<jar destfile="${export.dir}/${module.name}_${Bundle-Version}.jar" manifest="META-INF/MANIFEST.MF">
-			<fileset dir="${dir.bin}">
-				<include name="**/*.class" />
-				<include name="**/*.txt" />
-				<include name="**/*.xml" />
-				<include name="**/*.def" />
-				<include name="**/*.properties" />
-				<exclude name="**/*Test.class" />
-			</fileset>
-			<fileset dir=".">
-				<include name="plugin.xml" />
-				<include name="plugin*.properties" />
-				<include name="about.html" />
-				<include name=".options" />
-				<include name="META-INF/MANIFEST.MF" />
-				<include name="icons/*.*"/>
-			</fileset>
-		</jar>
-	</target>
-	
-	<target name="i18n">
-		<native2ascii
-			encoding="Cp1252"
-			src="."
-			dest="."
-			includes="plugin_de_DE.msg" ext=".properties"/>
-		<native2ascii
-			encoding="Cp1252"
-			src="."
-			dest="."
-			includes="plugin_es_ES.msg" ext=".properties"/>
-		<native2ascii
-			encoding="Cp1252"
-			src="."
-			dest="."
-			includes="plugin_fr_FR.msg" ext=".properties"/>
-		<native2ascii
-			encoding="GBK"
-			src="."
-			dest="."
-			includes="plugin_zh_CN.msg" ext=".properties"/>
-		<native2ascii
-			encoding="SJIS"
-			src="."
-			dest="."
-			includes="plugin_ja_JP.msg" ext=".properties"/>
-		<native2ascii
-			encoding="MS949"
-			src="."
-			dest="."
-			includes="plugin_ko_KR.msg" ext=".properties"/>
-	</target>
-	
-	<!-- public task UnitTest will not explicitly depend on complie, Top level script should call compile before calling UnitTest -->
-	<!-- Run Unit test.
-			 Parameters:
-			 		- ${utest.report.dir} target directory to put the unit test report
-	-->	
-	<target name="UnitTest" description="run all the unit tests" />
-	
-	<!-- Clean all objects created by this script -->
-	<target name="Clean" description="clean up">
-		<!-- Delete the ${dir.bin} and ${dir.utest} directory trees -->
-		<delete dir="${dir.bin}" />
-		<delete dir="${dir.utest}" />
-		<delete>
-			<fileset dir="." includes="*junit*" />
-		</delete>
-		<!-- Delete the target jar file -->
-		<delete file="${plugin.jar}" />
-	</target>
-	
-	<target name="Javadoc" />
-	<target name="apiJavaDoc" />
-	
-	<target name="buildDependency">
-		<echo message="start call Jar task in ${oda.jdbc.dir}"/>
-		<ant dir="${oda.jdbc.dir}" antfile="BuildOdaJdbc.xml" target="Jar" inheritAll="false">
-		 	<property name="eclipse.home" value="${eclipse.home}" />
-		</ant>
-		<echo message="end call Jar task in ${oda.jdbc.dir}"/>
-		
-		<echo message="start call Jar task in ${oda.jdbc.ui.dir}"/>
-		<ant dir="${oda.jdbc.ui.dir}" antfile="BuildOdaUI.xml" target="Jar" inheritAll="false">
-		  <property name="eclipse.home" value="${eclipse.home}" /> 
-		</ant>
-		<echo message="end call Jar task in ${oda.jdbc.ui.dir}"/>
-
-		<echo message="start call Jar task in ${sampledb.dir}"/>
-		<ant dir="${sampledb.dir}" antfile="BuildSampleDB.xml" target="Jar" inheritAll="false">
-		  <property name="eclipse.home" value="${eclipse.home}" /> 
-		</ant>
-		<echo message="end call Jar task in ${sampledb.dir}"/>
-
-<!--	<echo message="start call Jar task in ${oda.designer.ui.dir}"/>
-		<ant dir="${oda.designer.ui.dir}" antfile="build.xml" target="build.jars" inheritAll="false">
-			<property name="dtp.home" value="${dtp.home}"/>
-		</ant>
-		<echo message="end call Jar task in ${oda.designer.ui.dir}"/>
-		
-		<echo message="start call Jar task in ${oda.designer.dir}"/>
-		<ant dir="${oda.designer.dir}" antfile="build.xml" target="build.jars" inheritAll="false">
-			<property name="dtp.home" value="${dtp.home}"/>
-		</ant>
-		<echo message="end call Jar task in ${oda.designer.dir}"/>
--->	</target>
-	
-	<target name="compileSource" depends="buildDependency" description="compile the source ">
-		<mkdir dir="${dir.bin}" />
-		<copy todir="${dir.bin}">
-			<fileset dir="${dir.src}">
-				<include name="**/Messages*.properties"/>
-			</fileset>
-		</copy>
-		<!-- Compile the java code from ${dir.src} into ${dir.bin} -->
-		<javac srcdir="${dir.src}" 
-			   destdir="${dir.bin}" 
-			   encoding="utf-8" 
-			   source="1.4" 
-			   debug="true">
-			<classpath refid="class.path" />
-		</javac>
-	</target>
-
-</project>
-
diff --git a/data/org.eclipse.birt.report.data.oda.sampledb/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.sampledb/META-INF/MANIFEST.MF
index 6d9a8e73469..a8173137d49 100644
--- a/data/org.eclipse.birt.report.data.oda.sampledb/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.sampledb/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.sampledb;singleton:=true
 Bundle-Version: 4.17.0.qualifier
-Bundle-ClassPath: sampledb.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.sampledb.SampledbPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/data/org.eclipse.birt.report.data.oda.sampledb/build.properties b/data/org.eclipse.birt.report.data.oda.sampledb/build.properties
index 6ff9abf76db..37a6921bbb4 100644
--- a/data/org.eclipse.birt.report.data.oda.sampledb/build.properties
+++ b/data/org.eclipse.birt.report.data.oda.sampledb/build.properties
@@ -10,14 +10,13 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
-               sampledb.jar,\
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                db/BirtSample.jar,\
                plugin.xml,\
                plugin.properties,\
                .options,\
                about.html
-jars.compile.order = sampledb.jar
-source.sampledb.jar = src/
-output.sampledb.jar = target/classes/
 src.includes = about.html
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config/META-INF/MANIFEST.MF
index bc17782e429..e9aaa9e4f84 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config;singleton:=true
 Bundle-Version: 4.17.0.qualifier
-Bundle-ClassPath: library.jar,
- .
+Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config/build.properties b/engine/org.eclipse.birt.report.engine.emitter.config/build.properties
index 8b2c9dae547..632606d0d60 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config/build.properties
+++ b/engine/org.eclipse.birt.report.engine.emitter.config/build.properties
@@ -19,6 +19,5 @@ bin.includes = META-INF/,\
                schema/,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-customBuildCallbacks=customBuildCallbacks.xml
 src.includes = about.html
                
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config/customBuildCallbacks.xml b/engine/org.eclipse.birt.report.engine.emitter.config/customBuildCallbacks.xml
deleted file mode 100644
index a5eb8f6f6fd..00000000000
--- a/engine/org.eclipse.birt.report.engine.emitter.config/customBuildCallbacks.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<!--
- *******************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *   See git history
- *******************************************************************************
--->
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-		<property name="basedir" location="." />
-
-		<echo message="basedir: ${basedir}"/>
-
-		<!-- make crosstabcoreapi.jar-->
-		<echo message="make emitterconfig.jar"/>
-		<jar destfile="${basedir}/emitterconfig.jar">
-			<fileset dir="@dot">
-				<include name="org/eclipse/birt/report/engine/emitter/config/*.class" />
-			</fileset>
-		</jar>
-
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="pre.name">
-	</target>
-
-	<target name="pre.@dot">
-		
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do during the compilation target <name>, after the compile   -->
-	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
-	<!-- target, eg @dot                                                       -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.compile.name">
-	</target>
-
-	<target name="post.compile.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.name">
-	</target>
-
-	<target name="post.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">
-	</target>
-</project>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.html.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.html.tests/META-INF/MANIFEST.MF
index b15d5ef17cd..9dbadcff9d7 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.html.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.html.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="4.13.0",
  org.eclipse.birt.report.engine.emitter.html;bundle-version="4.13.0",
  org.junit;bundle-version="4.7.0"
-Bundle-ClassPath: emitterhtmltests.jar
+Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.html.tests
diff --git a/engine/org.eclipse.birt.report.engine.emitter.html.tests/build.properties b/engine/org.eclipse.birt.report.engine.emitter.html.tests/build.properties
index c1cf9ede32a..426f105b809 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.html.tests/build.properties
+++ b/engine/org.eclipse.birt.report.engine.emitter.html.tests/build.properties
@@ -10,10 +10,10 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-source.emitterhtmltests.jar = test/
-output.emitterhtmltests.jar = target/classes/
-bin.includes = META-INF/,\
-               emitterhtmltests.jar,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                test.xml,\
                about.html,\
                OSGI-INF/l10n/bundle.properties,\
diff --git a/engine/org.eclipse.birt.report.engine.emitter.html/build.properties b/engine/org.eclipse.birt.report.engine.emitter.html/build.properties
index 7d55ce003dd..6b2c258bc31 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.html/build.properties
+++ b/engine/org.eclipse.birt.report.engine.emitter.html/build.properties
@@ -17,7 +17,6 @@ bin.includes = META-INF/MANIFEST.MF,\
                about.html,\
                .,\
                plugin.xml,\
-               lib/,\
                OSGI-INF/l10n/bundle.properties,\
                META-INF/,\
                OSGI-INF/
diff --git a/engine/org.eclipse.birt.report.engine.emitter.html/lib/dummy.txt b/engine/org.eclipse.birt.report.engine.emitter.html/lib/dummy.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/META-INF/MANIFEST.MF
index 4e729bf32e3..5f09415911d 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 4.17.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.engine.emitter.pdf.tests.Activator
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: emitterpdf.jar
+Bundle-ClassPath: .
 Require-Bundle: org.eclipse.birt.report.engine.emitter.pdf;bundle-version="4.13.0",
  org.junit;bundle-version="4.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/build.properties b/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/build.properties
index abb0046dc21..426f105b809 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/build.properties
+++ b/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/build.properties
@@ -10,12 +10,11 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-source.emitterpdf.jar = test/
-output.emitterpdf.jar = target/classes/
-bin.includes = META-INF/,\
-               emitterpdf.jar,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                test.xml,\
                about.html,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-source.emitterpdf.jar = test/
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pdf/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.pdf/META-INF/MANIFEST.MF
index 791e92081ab..df90db2e4bc 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pdf/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.pdf/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.pdf; singleton:=true
 Bundle-Version: 4.17.0.qualifier
-Bundle-ClassPath: library.jar,
- .
+Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.core;bundle-version="[2.1.0,5.0.0)",
  org.eclipse.birt.report.model;bundle-version="[2.1.0,5.0.0)",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pdf/build.properties b/engine/org.eclipse.birt.report.engine.emitter.pdf/build.properties
index f265b3a7f0a..52acaf7ef7f 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pdf/build.properties
+++ b/engine/org.eclipse.birt.report.engine.emitter.pdf/build.properties
@@ -21,5 +21,4 @@ bin.includes = .options,\
                META-INF/,\
                OSGI-INF/
 src.includes = about.html
-jars.compile.order = .
 
diff --git a/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/META-INF/MANIFEST.MF
index 9c629e3d9a7..92d2f32553d 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.birt.core;bundle-version="4.13.0",
  org.eclipse.birt.report.engine.emitter.postscript;bundle-version="4.13.0",
  org.junit;bundle-version="4.7.0";resolution:=optional;visibility:=reexport
 Bundle-Vendor: %Bundle-Vendor
-Bundle-ClassPath: emitterpostscript.jar
+Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.postscript.tests
 Export-Package: org.eclipse.birt.report.engine.emitter.postscript;x-internal:=true,
diff --git a/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/build.properties b/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/build.properties
index b1d3a32f51a..67a2cce9f8d 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/build.properties
+++ b/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/build.properties
@@ -10,10 +10,10 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-source.emitterpostscript.jar = test/
-output.emitterpostscript.jar = target/classes/
-bin.includes = META-INF/,\
-               emitterpostscript.jar,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                about.html,\
                test.xml,\
                OSGI-INF/l10n/bundle.properties,\
diff --git a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/META-INF/MANIFEST.MF
index 792dc5c7aff..32cf4b20a5f 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.birt.report.engine.emitter.prototype.excel;bundle-ve
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.osgi.framework;version="1.5.0"
-Bundle-ClassPath: emitterexceltests.jar
+Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.prototype.excel.tests
 Export-Package: org.eclipse.birt.report.engine.emitter.prototype.excel;x-internal:=true,
diff --git a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/build.properties b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/build.properties
index 1c5840a0236..426f105b809 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/build.properties
+++ b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/build.properties
@@ -10,10 +10,10 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-source.emitterexceltests.jar = test/
-output.emitterexceltests.jar = target/classes/
-bin.includes = META-INF/,\
-               emitterexceltests.jar,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                test.xml,\
                about.html,\
                OSGI-INF/l10n/bundle.properties,\
diff --git a/engine/org.eclipse.birt.report.engine.testhelper/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.testhelper/META-INF/MANIFEST.MF
index b876c621b3b..aac25c9add7 100644
--- a/engine/org.eclipse.birt.report.engine.testhelper/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.testhelper/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.testhelper
 Bundle-Version: 4.17.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine;bundle-version="[2.5.0,5.0.0)"
-Bundle-ClassPath: enginetesthelper.jar
+Bundle-ClassPath: .
 Export-Package: org.eclipse.birt.report.engine,
  org.eclipse.birt.report.engine.api,
  org.eclipse.birt.report.engine.api.impl,
diff --git a/engine/org.eclipse.birt.report.engine.testhelper/build.properties b/engine/org.eclipse.birt.report.engine.testhelper/build.properties
index a7a551e7ccf..2776221dcb3 100644
--- a/engine/org.eclipse.birt.report.engine.testhelper/build.properties
+++ b/engine/org.eclipse.birt.report.engine.testhelper/build.properties
@@ -10,11 +10,10 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
+bin.includes = .,\
+               META-INF/,\
                about.html,\
-               enginetesthelper.jar,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-jars.compile.order = enginetesthelper.jar
-source.enginetesthelper.jar = test/
-output.enginetesthelper.jar = target/classes/
+source.. = test/
+output.. = target/classes/
diff --git a/engine/org.eclipse.birt.report.engine.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.tests/META-INF/MANIFEST.MF
index d722e142082..6517a7bd2ea 100644
--- a/engine/org.eclipse.birt.report.engine.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.birt.core;bundle-version="[2.1.0,5.0.0)",
  org.junit;bundle-version="4.13.0";resolution:=optional;visibility:=reexport,
  org.eclipse.birt.report.engine.dataextraction.csv;bundle-version="[2.6.0,5.0.0)",
  org.eclipse.birt.report.engine.dataextraction;bundle-version="[2.6.0,5.0.0)"
-Bundle-ClassPath: reportenginetests.jar
+Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.birt.report.engine.tests
 Export-Package: org.eclipse.birt.report.engine;x-internal:=true,
diff --git a/engine/org.eclipse.birt.report.engine.tests/build.properties b/engine/org.eclipse.birt.report.engine.tests/build.properties
index 96599c17cd9..353e3da1308 100644
--- a/engine/org.eclipse.birt.report.engine.tests/build.properties
+++ b/engine/org.eclipse.birt.report.engine.tests/build.properties
@@ -10,10 +10,10 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-source.reportenginetests.jar = test/
-output.reportenginetests.jar = target/classes/
-bin.includes = META-INF/,\
-               reportenginetests.jar,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                about.html,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
diff --git a/engine/org.eclipse.birt.report.engine/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine/META-INF/MANIFEST.MF
index 3d71dc7b18f..15fec909e19 100644
--- a/engine/org.eclipse.birt.report.engine/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine; singleton:=true
 Bundle-Version: 4.17.0.qualifier
-Bundle-ClassPath: enginetesthelper.jar,
- .,
+Bundle-ClassPath: .,
  lib/Tidy.jar,
  lib/commons-cli-1.0.jar
 Bundle-Activator: org.eclipse.birt.report.engine.plugin.EnginePlugin
diff --git a/engine/uk.co.spudsoft.birt.emitters.excel.tests/build.properties b/engine/uk.co.spudsoft.birt.emitters.excel.tests/build.properties
index 5c6d3f20d99..b04ea9a3222 100644
--- a/engine/uk.co.spudsoft.birt.emitters.excel.tests/build.properties
+++ b/engine/uk.co.spudsoft.birt.emitters.excel.tests/build.properties
@@ -15,7 +15,6 @@ output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                COPYING,\
-               lib/,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
 jars.compile.order = .,
diff --git a/engine/uk.co.spudsoft.birt.emitters.excel.tests/lib/commons-codec-1.5.jar b/engine/uk.co.spudsoft.birt.emitters.excel.tests/lib/commons-codec-1.5.jar
deleted file mode 100644
index e9013fed78f..00000000000
Binary files a/engine/uk.co.spudsoft.birt.emitters.excel.tests/lib/commons-codec-1.5.jar and /dev/null differ
diff --git a/engine/uk.co.spudsoft.birt.emitters.excel.tests/lib/xmlbeans-2.3.0.jar b/engine/uk.co.spudsoft.birt.emitters.excel.tests/lib/xmlbeans-2.3.0.jar
deleted file mode 100644
index ccd8163421b..00000000000
Binary files a/engine/uk.co.spudsoft.birt.emitters.excel.tests/lib/xmlbeans-2.3.0.jar and /dev/null differ
diff --git a/model/org.eclipse.birt.report.model.adapter.oda.tests/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model.adapter.oda.tests/META-INF/MANIFEST.MF
index b3f6fadf81f..85799fe8206 100644
--- a/model/org.eclipse.birt.report.model.adapter.oda.tests/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model.adapter.oda.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.birt.core;bundle-version="4.13.0",
  org.eclipse.datatools.connectivity.oda.design;bundle-version="3.5.101",
  org.junit;bundle-version="4.8.1";resolution:=optional;visibility:=reexport
 Bundle-Vendor: %Bundle-Vendor
-Bundle-ClassPath: modeladapterodatests.jar
+Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.birt.report.model.adapter.oda;x-internal:=true,
  org.eclipse.birt.report.model.adapter.oda.api;x-internal:=true,
diff --git a/model/org.eclipse.birt.report.model.adapter.oda.tests/build.properties b/model/org.eclipse.birt.report.model.adapter.oda.tests/build.properties
index fdd6c276822..67a2cce9f8d 100644
--- a/model/org.eclipse.birt.report.model.adapter.oda.tests/build.properties
+++ b/model/org.eclipse.birt.report.model.adapter.oda.tests/build.properties
@@ -10,10 +10,10 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-source.modeladapterodatests.jar = test/
-output.modeladapterodatests.jar = target/classes/
-bin.includes = META-INF/,\
-               modeladapterodatests.jar,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                about.html,\
                test.xml,\
                OSGI-INF/l10n/bundle.properties,\
diff --git a/model/org.eclipse.birt.report.model.adapter.oda/BuildModelOdaAdapter.xml b/model/org.eclipse.birt.report.model.adapter.oda/BuildModelOdaAdapter.xml
deleted file mode 100644
index 8ae908ab258..00000000000
--- a/model/org.eclipse.birt.report.model.adapter.oda/BuildModelOdaAdapter.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0"?>
-<!--
- *************************************************************************
- * Copyright (c) 2004, 2005 Actuate Corporation.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- *
- * Contributors:
- *  Actuate Corporation  - initial API and implementation
- *  
- *************************************************************************
- *
- *  Build.xml
- *
- *  Created on 03/15/2005
- *  Build script for project org.eclipse.birt.report.model
- *
- * 
- * The following are public targets callable by external users. 
- * 
- * "Clean" - Clean all objects created by this script. Individual project build script can not call this target; 
- * "Jar" - Compile source code and generate jar for this project.
- *          The compile dependency on other projects should be defined explicitly.
- *         eclipse.home should be passed in when Individual project build script  call this target; 
- *          the property of "failonerror" should be set true(default) when compiling source code
- * "UnitTest" - Run unit tests. This task must be called after calling Jar task, 
- *              so it needn't depend on Jar explicitly
- * "Export" - Export the project, for instance, jar files are copied to a designated folder. 
- *            this task must be called after calling Jar task, so it needn't depend on Jar explicitly
- * "JavaDoc" - generate java documents
- *
- * Usage:
- *    ant [any one or more of the public targets] 
- *        -Declipse.home=<your eclipse home> 
- *		  -Ddtp.home=<your DTP plugins source home>  [optional]
- *
- * Default target is "Jar".
- *
- * 
- * This script may also additional targets. These targets are private to this build script only. 
- *
- * "utest" - Run unit tests
- *
- * Notes:
- *  1. classpath need to be set for junit.jar
- *  2. This file now requires Ant 1.6
- *
- * Change History:
- *
- *    1. 03/15/2005: initial version
- *
--->
-<project name="Birt Model ODA Adapter Project" basedir="." default="Jar">
-	<!-- set global properties for this build -->
-	<!-- Public properties, used by public targets, top level build script
-		     will pass on the value at runtime. Properties will have there default
-		     value.
-
-		     eclipse.home
-		     dtp.home
-		     javadoc.dir
-		     plugin.version 
-	-->
-	<!--properties -->
-
-	<!-- ===== Default value for public properties ============= -->
-	<property name="javadoc.dir" location="docs/api" />
-	<property name="api.javadoc.dir" location="docs/api" />
-	<property name="export.dir" location="export" />
-	
-	<property name="eclipse.home" location="." />
-	<property name="dtp.home" location="${eclipse.home}/plugins" />
-	
-	<property name="manifest" value="META-INF/MANIFEST.MF" />
-	
-	<property name="core.dir" value="../org.eclipse.birt.core" />
-	<property name="model.dir" value="../org.eclipse.birt.report.model" />
-	<property name="data.oda.dir" value="../org.eclipse.birt.data.oda" />	
-	<property name="module.name" value = "org.eclipse.birt.report.model.adapter.oda" />
-	
-	<property name="src.dir" value="src" />
-	<property name="build.dir" value="bin" />
-	<property name="test.src.dir" value="test" />
-	<property name="test.build.dir" value="build" />
-	
-	<!-- Class Path -->
-	<path id="class.path">
-		<pathelement path="${build.dir}" />
-		<pathelement path="${core.dir}\core.jar" />
-		<pathelement path="${model.dir}\model.jar" />
-		<pathelement path="${data.oda.dir}\oda.jar" />		
-		<fileset dir="${eclipse.home}/plugins">
-			<include name="org.eclipse.core.runtime_*.jar"/>
-			<include name="org.eclipse.equinox.*.jar"/>
-			<include name="org.eclipse.emf.ecore_*.jar"/>
-			<include name="org.eclipse.emf.ecore.xmi_*.jar"/>
-			<include name="org.eclipse.emf.common_*.jar"/>
-			<include name="org.eclipse.osgi_*/*.jar"/>
-			<include name="org.eclipse.osgi*.jar"/>			
-	        <include name="org.junit_*/*.jar"/>	
-			<include name="com.ibm.icu_*.jar"/>	
-            <include name="org.eclipse.datatools.connectivity*.jar"/>
-            <include name="org.eclipse.datatools.connectivity*/*.jar"/>							
-		</fileset>		
-	</path>
-
-	
-	<!-- Compile source code and generate jar for this project 
-		 Input parameters:
-		 	eclipse.home
-		 	dtp.home
-	-->
-	
-	<target name="Jar" depends="compileSource">
-		
-		<jar destfile="modeloda.jar">
-			<fileset dir="${build.dir}">
-				<exclude name="**/*Test.class"/>
-			</fileset>
-		</jar>
-		
-		<jar destfile="modelodaapi.jar" >
-			<fileset dir="${build.dir}">
-				<exclude name="org/eclipse/birt/report/model/adapter/oda/plugin/"/>
-				<exclude name="org/eclipse/birt/report/model/adapter/oda/impl/"/>
-				<exclude name="org/eclipse/birt/report/model/adapter/oda/model/"/>	
-				<exclude name="org/eclipse/birt/report/model/adapter/oda/util/"/>				
-			</fileset>
-		</jar>
-					
-	</target>
-
-	
-	<!-- Export the project, for instance, jar files are copied to a designated folder
-		 the dependency on Jar should implement in top level script by call sequence	
-		 Parameters:
-		 		- ${export.dir} target directory to put the plugin binaries
-	 -->
-	<target name="Export">
-		<mkdir dir="${export.dir}"/>
-		<property file="META-INF/MANIFEST.MF" />		
-		<property name="plugin.package" value="${module.name}_${Bundle-Version}" />		
-		
-		<echo message="Export Model Oda Adapter version = ${Bundle-Version}" />
-		
-		<jar destfile="${export.dir}/${module.name}_${Bundle-Version}.jar" manifest="${manifest}">
-			<fileset dir="${basedir}">
-	   			<include name="${manifest}"/>				
-				<include name="plugin.xml"/>
-				<include name=".options"/>
-				<include name="about.html"/>				
-			</fileset>
-			<fileset dir="${build.dir}/">
-				<include name="*/**"/>
-			</fileset>
-		</jar>			    
-	</target>
-	
-	<!-- Clean the build environment -->
-	<target name="Clean">
-		<delete dir="${build.dir}" />
-		<delete dir="${javadoc.dir}"/>
-		<delete dir="${export.dir}"/>
-		<delete file="modeloda.jar" />
-	</target>
-
-	
-	<!-- Generate the JavaDoc.
-		 Parameters:
-		 		- ${javadoc.dir} target directory to put the java document
-	 -->	
-	<target name="Javadoc">
-		<mkdir dir="${javadoc.dir}" />
-		<javadoc destdir="${javadoc.dir}" 
-				 author="true" 
-				 version="true" 
-				 use="true" 
-				 doctitle="Birt Model ODA Adapter API (Provisional)" 
-				 windowtitle="Birt Model ODA Adapter API - Provisional" 
-				 source="1.4"
-				 packagenames="${module.name}.*">
-				<packageset dir="${src.dir}" defaultexcludes="yes" />
-	 	        <bottom><![CDATA[<i>Copyright &#169;  2005 Actuate Corp. All rights reserved. </i>]]></bottom>
-				<classpath refid="class.path" />
-		</javadoc>
-	</target>
-		
-	<!-- Build the dependent projects -->
-	<target name="buildDependents" description="Build all the projects it depends on">
-		<echo message="start call Jar task in ${model.dir}" level="info"/>
-		<ant dir="${model.dir}" antfile="BuildModel.xml" target="Jar" inheritall="false">
-		 	<property name="eclipse.home" value="${eclipse.home}" />
-		</ant>
-		<echo message="end call Jar task in ${model.dir}" level="info" />
-		
-	</target>
-		
-	<!-- Compile Model Source Files -->
-    <target name="compileSource" depends="buildDependents" description="Model ODA Adapter source file">
-    	<mkdir dir="${build.dir}" />
-		
-		<!-- Copy all resource files into bin -->
-    	<copy todir="${build.dir}">
-	   		<fileset dir="${src.dir}">
-	   			<include name="**/*.properties"/>
-	   		</fileset>
-	   	</copy>
-    
-    	<javac srcdir="${src.dir}" 
-			destdir="${build.dir}" 
-			optimize="true" 
-			source="1.4" 
-			target="1.4"
-			debug="true" 
-			encoding="utf-8" 
-			failonerror="true">
-			<classpath refid="class.path" />
-		</javac>
-	</target>
-	
-</project>
diff --git a/model/org.eclipse.birt.report.model.adapter.oda/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model.adapter.oda/META-INF/MANIFEST.MF
index e5e77632245..377ebdc7dbc 100644
--- a/model/org.eclipse.birt.report.model.adapter.oda/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model.adapter.oda/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.model.adapter.oda; singleton:=true
 Bundle-Version: 4.17.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.model.adapter.oda.plugin.ModelAdapterOdaPlugin
-Bundle-ClassPath: modelODAFragment.jar,
- .
+Bundle-ClassPath: .
 Eclipse-ExtensibleAPI: true 
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/model/org.eclipse.birt.report.model.adapter.oda/build.properties b/model/org.eclipse.birt.report.model.adapter.oda/build.properties
index af5651d142d..8a7936965a0 100644
--- a/model/org.eclipse.birt.report.model.adapter.oda/build.properties
+++ b/model/org.eclipse.birt.report.model.adapter.oda/build.properties
@@ -18,5 +18,4 @@ bin.includes = META-INF/,\
                schema/,\
                .,\
                plugin.properties
-src.includes = about.html
-customBuildCallbacks=customBuildCallbacks.xml
+src.includes = about.html
\ No newline at end of file
diff --git a/model/org.eclipse.birt.report.model.adapter.oda/customBuildCallbacks.xml b/model/org.eclipse.birt.report.model.adapter.oda/customBuildCallbacks.xml
deleted file mode 100644
index 251fdfece31..00000000000
--- a/model/org.eclipse.birt.report.model.adapter.oda/customBuildCallbacks.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<!--
- *******************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *   See git history
- *******************************************************************************
--->
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-		<property name="basedir" location="." />
-
-		<echo message="basedir: ${basedir}"/>
-		<echo message="build.result.folder: ${build.result.folder}"/>
-
-		<!-- make modelapi.jar-->
-		<echo message="make modelodaapi.jar"/>
-		<jar destfile="${basedir}/modelodaapi.jar" >
-			<fileset dir="@dot">
-				<exclude name="org/eclipse/birt/report/model/adapter/oda/plugin/"/>
-				<exclude name="org/eclipse/birt/report/model/adapter/oda/impl/"/>
-				<exclude name="org/eclipse/birt/report/model/adapter/oda/model/"/>	
-				<exclude name="org/eclipse/birt/report/model/adapter/oda/util/"/>				
-			</fileset>
-		</jar>
-
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="pre.name">
-	</target>
-
-	<target name="pre.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do during the compilation target <name>, after the compile   -->
-	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
-	<!-- target, eg @dot                                                       -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.compile.name">
-	</target>
-
-	<target name="post.compile.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.name">
-	</target>
-
-	<target name="post.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-	</target>
-		
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">        
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">       
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">              
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">             
-	</target>
-</project>
diff --git a/model/org.eclipse.birt.report.model.adapter.oda/lib/odadesignapi.jar b/model/org.eclipse.birt.report.model.adapter.oda/lib/odadesignapi.jar
deleted file mode 100644
index c45b8308164..00000000000
Binary files a/model/org.eclipse.birt.report.model.adapter.oda/lib/odadesignapi.jar and /dev/null differ
diff --git a/model/org.eclipse.birt.report.model.testhelper/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model.testhelper/META-INF/MANIFEST.MF
index 2701e36c42a..581040e8131 100644
--- a/model/org.eclipse.birt.report.model.testhelper/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model.testhelper/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Export-Package: org.eclipse.birt.report.model.activity;x-friends:="org.eclipse.b
  org.eclipse.birt.report.model.extension;x-friends:="org.eclipse.birt.report.model.tests",
  org.eclipse.birt.report.model.metadata;x-friends:="org.eclipse.birt.report.model.tests",
  org.eclipse.birt.report.model.writer;x-friends:="org.eclipse.birt.report.model.tests,com.actuate.birt.report.model.tests"
-Bundle-ClassPath: tests.jar
+Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.birt.report.model.testhelper
diff --git a/model/org.eclipse.birt.report.model.testhelper/build.properties b/model/org.eclipse.birt.report.model.testhelper/build.properties
index 9ca831ef344..24fdb433bfa 100644
--- a/model/org.eclipse.birt.report.model.testhelper/build.properties
+++ b/model/org.eclipse.birt.report.model.testhelper/build.properties
@@ -10,11 +10,10 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                about.html,\
-               tests.jar,\
                OSGI-INF/l10n/bundle.properties,\
-               OSGI-INF/
-jars.compile.order = tests.jar
-source.tests.jar = test/
-output.tests.jar = target/classes/
+               OSGI-INF/
\ No newline at end of file
diff --git a/model/org.eclipse.birt.report.model.tests/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model.tests/META-INF/MANIFEST.MF
index c0c192ca512..162ef9b2c9d 100644
--- a/model/org.eclipse.birt.report.model.tests/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.birt.core;bundle-version="[2.1.0,5.0.0)",
  org.eclipse.birt.report.model;bundle-version="[2.1.0,5.0.0)",
  org.apache.commons.codec;bundle-version="[1.3.0,2.0.0)",
  org.junit;bundle-version="4.8.1"
-Bundle-ClassPath: modeltests.jar
+Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.birt.report.model.i18n,
  org.eclipse.birt.report.model.util
diff --git a/model/org.eclipse.birt.report.model.tests/build.properties b/model/org.eclipse.birt.report.model.tests/build.properties
index 419671ed2cd..f7e492f951c 100644
--- a/model/org.eclipse.birt.report.model.tests/build.properties
+++ b/model/org.eclipse.birt.report.model.tests/build.properties
@@ -10,10 +10,10 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-source.modeltests.jar = test/
-output.modeltests.jar = target/classes/
-bin.includes = META-INF/,\
-               modeltests.jar,\
+source.. = test/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                about.html,\
                test.xml,\
                OSGI-INF/l10n/bundle.properties,\
diff --git a/model/org.eclipse.birt.report.model/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model/META-INF/MANIFEST.MF
index 86e5c5824b7..28cf2437f1b 100644
--- a/model/org.eclipse.birt.report.model/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model/META-INF/MANIFEST.MF
@@ -5,9 +5,7 @@ Bundle-SymbolicName: org.eclipse.birt.report.model; singleton:=true
 Bundle-Version: 4.17.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.model.plugin.ModelPlugin
 Eclipse-BuddyPolicy: registered
-Bundle-ClassPath: tests.jar,
- modelFragment_internal.jar,
- .
+Bundle-ClassPath: .
 Eclipse-ExtensibleAPI: true 
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.birt.report.model.activity;x-friends:="org.eclipse.birt.report.model.tests,org.eclipse.birt.report.item.crosstab.core",
diff --git a/model/org.eclipse.birt.report.model/build.properties b/model/org.eclipse.birt.report.model/build.properties
index 490707417fe..5790050c96b 100644
--- a/model/org.eclipse.birt.report.model/build.properties
+++ b/model/org.eclipse.birt.report.model/build.properties
@@ -22,5 +22,3 @@ bin.includes = .options,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
 src.includes = about.html
-customBuildCallbacks=customBuildCallbacks.xml
-jars.compile.order = .
diff --git a/model/org.eclipse.birt.report.model/customBuildCallbacks.xml b/model/org.eclipse.birt.report.model/customBuildCallbacks.xml
deleted file mode 100644
index 759f534f3fc..00000000000
--- a/model/org.eclipse.birt.report.model/customBuildCallbacks.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<!--
- *******************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *   See git history
- *******************************************************************************
--->
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-		<property name="romdoc.output.dir" location="romdoc/gen" />
-		<property name="basedir" location="." />
-
-		<echo message="romdoc.output.dir: ${romdoc.output.dir}"/>
-		<echo message="basedir: ${basedir}"/>
-		<echo message="build.result.folder: ${build.result.folder}"/>
-
-		<delete dir="${romdoc.output.dir}" failonerror="false"/>
-		<mkdir dir="${romdoc.output.dir}" />
-
-		<!-- make modelapi.jar-->
-		<echo message="make modelapi.jar"/>
-		<jar destfile="${basedir}/modelapi.jar" >
-			<fileset dir="@dot">
-				<exclude name="org/eclipse/birt/report/model/plugin/"/>
-				<exclude name="org/eclipse/birt/report/model/api/impl/"/>
-				<exclude name="org/eclipse/birt/report/model/api/filterExtension/FilterExprDefinition*.class"/>
-				<exclude name="org/eclipse/birt/report/model/api/filterExtension/ODAFilterExprProvider.class"/>
-				<exclude name="org/eclipse/birt/report/model/simpleapi/"/>				
-				<exclude name="**/*Test.class"/>	
-				<exclude name="**/*Test$*.class/"/>	
-				<exclude name="**/*TestCase.class/"/>									
-				<exclude name="**/*TestCase$*.class/"/>																												
-				<exclude name="**/AllTests.class"/>		
-				<exclude name="**/Messages_aa.properties"/>								   
-				<exclude name="romdoc/**"/>		   
-				<exclude name="org/eclipse/birt/report/model/library/"/>
-				<exclude name="**/input/"/>
-				<exclude name="**/golden/"/>								
-			</fileset>
-		</jar>
-		
-		<java classname="org.eclipse.birt.doc.romdoc.RomDoc" fork="true">
-	        	<arg value="${romdoc.output.dir}"/>
-			<arg value="${basedir}/romdoc/docs" />
-			<classpath>
-			    <pathelement path="@dot"/>
-			    <pathelement path="${build.dir}"/>
-			    <pathelement path="../org.eclipse.birt.core/@dot" />
-			    <fileset dir="../org.w3c.sac/lib">
-					<include name="*.jar" />
-			    </fileset>					
-			    <fileset dir="${baseLocation}/plugins/">			
-					<include name="com.ibm.icu_*.jar"/>
-			    	<include name="org.apache.commons.codec_*.jar"/>
-			    	<include name="org.w3c.css.sac_*.jar"/>
-			    </fileset>				
-			</classpath>
-		</java>
-
-		<!-- Copy css styles -->
-		<copy todir="${romdoc.output.dir}/style">
-			<fileset dir="romdoc/docs/style">
-				<include name="*.css"/>
-			</fileset>
-		</copy>
-
-		<!-- copy result to doc sub-folder -->
-	        <mkdir dir="${build.result.folder}/doc/rom"/>
-	        <copy todir="${build.result.folder}/doc/rom">
-			<fileset dir="${romdoc.output.dir}">
-				<include name="**/*"/>
-			</fileset>
-		</copy>
-		
-		
-
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="pre.name">
-	</target>
-
-	<target name="pre.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do during the compilation target <name>, after the compile   -->
-	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
-	<!-- target, eg @dot                                                       -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.compile.name">
-	</target>
-
-	<target name="post.compile.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.name">
-	</target>
-
-	<target name="post.@dot">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-	</target>
-		
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">        
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">       
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">              
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">             
-	</target>
-</project>
diff --git a/testsuites/org.eclipse.birt.report.tests.chart/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.report.tests.chart/META-INF/MANIFEST.MF
index aac4258b76f..0083e8549fb 100644
--- a/testsuites/org.eclipse.birt.report.tests.chart/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.report.tests.chart/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.tests.chart
-Bundle-ClassPath: test-chart.jar
+Bundle-ClassPath: .
 Bundle-Version: 4.17.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.tests.chart.plugin.ChartPlugin
 Bundle-ActivationPolicy: lazy
diff --git a/testsuites/org.eclipse.birt.report.tests.chart/build.properties b/testsuites/org.eclipse.birt.report.tests.chart/build.properties
index 66e2920a7de..8226be063fd 100644
--- a/testsuites/org.eclipse.birt.report.tests.chart/build.properties
+++ b/testsuites/org.eclipse.birt.report.tests.chart/build.properties
@@ -10,20 +10,11 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
-               test.xml,\
-               about.html,\
-               OSGI-INF/l10n/bundle.properties
-               
-jars.compile.order = test-chart.jar
-source.test-chart.jar = src/
-output.test-chart.jar = bin/
-src.includes = .classpath,\
-               .project,\
+source.. = src/
+output.. = bin/
+bin.includes = .,\
                META-INF/,\
+               test.xml,\
                about.html,\
-               build.properties,\
-               build.xml,\
-               pom.xml,\
-               src/,\
-               test.xml
+               OSGI-INF/
+src.includes = about.html
diff --git a/testsuites/org.eclipse.birt.report.tests.chart/build.xml b/testsuites/org.eclipse.birt.report.tests.chart/build.xml
deleted file mode 100644
index 1aab51732e9..00000000000
--- a/testsuites/org.eclipse.birt.report.tests.chart/build.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- *******************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *   See git history
- *******************************************************************************
--->
-<project name="Birt Test Chart Project" basedir="." default="utest">
-
-	<!-- set global properties for this build -->
-	<!-- Public properties, used by public targets, top level build script
-		     will pass on the value at runtime. Properties will have there default
-		     value.
-
-		     eclipse.home
-		     dtp.home
-		     test.report.dir
-		     javadoc.dir
-		     plugin.version 
-	-->
-	<!--properties -->
-
-	<!-- ===== Default value for public properties ============= -->
-	<property name="test.report.dir" location="report" />
-	<property name="test.report.xml.dir" location="${test.report.dir}/xml" />
-
-	<property name="eclipse.home" location="." />
-	<property name="dtp.home" location=".." />
-
-	<property name="module.name" value="org.eclipse.birt.report.tests.chart" />
-	<property name="utest.report.dir" location="utestreports" />
-
-	<property name="tests.core.dir" location="../org.eclipse.birt.tests.core" />
-	<property name="core.dir" location="../org.eclipse.birt.core" />
-	<property name="data.oda.dir" location="../org.eclipse.birt.data.oda" />
-	<property name="data.oda.jdbc.dir" location="../org.eclipse.birt.report.data.oda.jdbc" />
-	<property name="datatools.connectivity.oda.dir" location="../org.eclipse.datatools.connectivity.oda" />
-	<property name="testmodule.name" value="org.eclipse.birt.report.tests.chart" />
-
-	<property name="core.dir" location="../org.eclipse.birt.core" />
-	<property name="model.dir" location="../org.eclipse.birt.report.model" />
-	<property name="chart.engine.dir" location="../org.eclipse.birt.chart.engine" />
-	<property name="chart.engine.extension.dir" location="../org.eclipse.birt.chart.engine.extension" />
-	<property name="chart.device.extension.dir" location="../org.eclipse.birt.chart.device.extension" />
-
-
-	<property name="src" location="src" />
-	<property name="bin" location="bin" />
-
-	<!-- Class Path -->
-	<path id="class.path">
-		<pathelement path="${bin}" />
-
-		<fileset dir="../org.mozilla.rhino">
-			<include name="lib/*.jar" />
-		</fileset>
-
-		<pathelement path="${tests.core.dir}/bin" />
-
-		<fileset dir="..">
-			<include name="org.eclipse.birt.chart.reportitem/reportitem.jar" />
-			<include name="org.eclipse.birt.chart.device.extension/*.jar" />
-			<include name="org.eclipse.birt.chart.engine.extension/*.jar" />
-			<include name="org.eclipse.birt.chart.engine/*.jar" />
-			<include name="org.eclipse.birt.core/*.jar" />
-			<include name="org.eclipse.birt.report.model/*.jar" />
-		</fileset>
-
-		<fileset dir="${eclipse.home}/plugins">
-			<include name="com.ibm.icu_*.jar" />
-			<include name="org.eclipse.emf*.jar" />
-			<include name="org.eclipse.swt*.jar" />
-			<include name="org.junit_*/*.jar" />
-			<include name="org.eclipse.core.runtime*.jar" />
-			<include name="org.eclipse.osgi*.jar" />
-			<include name="org.eclipse.osgi_*/*.jar" />
-		</fileset>
-	</path>
-
-	<!-- Compile Model Test Files 
-		 javac.failonerror should be true.
-	-->
-	<target name="compileTest" description="Compile test codes" depends="buildDependents">
-		<mkdir dir="${bin}" />
-
-		<copy todir="${bin}">
-			<fileset dir="${src}">
-				<include name="**/input/*.*" />
-				<include name="**/golden/*.*" />
-				<include name="**/*.properties" />
-			</fileset>
-		</copy>
-
-		<javac srcdir="${src}" destdir="${bin}" source="1.4" target="1.4" debug="true" encoding="utf-8" failonerror="true">
-			<classpath refid="class.path" />
-		</javac>
-	</target>
-
-	<target name="UnitTest">
-		<delete dir="${utest.report.dir}" />
-		<mkdir dir="${utest.report.dir}" />
-		<ant dir="../org.eclipse.birt.core" antfile="BuildCore.xml" target="UnitTest" inheritAll="false" inheritRefs="false">
-			<property name="dir.utest" value="utest" />
-			<property name="module.name" value="${module.name}" />
-			<property name="utest.report.dir" value="${utest.report.dir}" />
-			<property name="classname" value="org.eclipse.birt.report.tests.chart.AllTests" />
-		</ant>
-	</target>
-
-	<target name="Report">
-		<junitreport todir="${utest.report.dir}">
-			<fileset dir="${utest.report.dir}">
-				<include name="*.xml" />
-				<exclude name="*TestSuites.xml" />
-			</fileset>
-			<report format="noframes" todir="${utest.report.dir}/" />
-		</junitreport>
-		<antcall target="Export"/>
-	</target>
-
-
-	<!-- Clean the build environment -->
-	<target name="Clean">
-		<delete dir="${bin}" />
-		<delete dir="${test.report.dir}" />
-	</target>
-
-
-	<!-- Build the dependent projects -->
-	<target name="buildDependents" description="Build all the projects it depends on">
-		<echo message="start call Jar task in ${core.dir}" level="info" />
-		<ant dir="${core.dir}" antfile="BuildCore.xml" target="Jar" inheritall="false">
-			<property name="eclipse.home" value="${eclipse.home}" />
-		</ant>
-		<echo message="end call Jar task in ${core.dir}" level="info" />
-
-		<echo message="start call Jar task in ${model.dir}" level="info" />
-		<ant dir="${model.dir}" antfile="BuildModel.xml" target="Jar" inheritall="false">
-			<property name="eclipse.home" value="${eclipse.home}" />
-		</ant>
-		<echo message="end call Jar task in ${model.dir}" level="info" />
-
-		<echo message="start call Jar task in ${chart.engine.extension.dir}" level="info" />
-		<ant dir="${chart.engine.extension.dir}" antfile="BuildChartEngineExtension.xml" target="Jar" inheritall="false">
-			<property name="eclipse.home" value="${eclipse.home}" />
-		</ant>
-		<echo message="end call Jar task in ${chart.engine.extension.dir}" level="info" />
-
-		<echo message="start call Jar task in ${chart.device.extension.dir}" level="info" />
-		<ant dir="${chart.device.extension.dir}" antfile="BuildChartDeviceExtension.xml" target="Jar" inheritall="false">
-			<property name="eclipse.home" value="${eclipse.home}" />
-		</ant>
-		<echo message="end call Jar task in ${chart.device.extension.dir}" level="info" />
-
-		<echo message="start building tests.core" />
-		<ant dir="${tests.core.dir}" target="compileTest" antfile="build.xml" inheritAll="false" inheritrefs="false" />
-		<echo message="end building tests.core" />
-	</target>
-	
-	<target name="Export">
-		<copy todir="${utest.report.dir}/${module.name}/Output/regression" failonerror="false">
-		<fileset dir="${src}/org/eclipse/birt/report/tests/chart/regression/output">
-			<include name="*"/>
-		</fileset>
-		<fileset dir="${src}/org/eclipse/birt/report/tests/chart/acceptance/output">
-			<include name="*"/>
-		</fileset>
-		<fileset dir="${src}/org/eclipse/birt/report/tests/chart/smoke/output">
-			<include name="*"/>
-		</fileset>
-		</copy>
-	</target>
-
-
-
-	<!-- private task, run unit test -->
-	<target name="utest" depends="compileTest,UnitTest,Report,Export" />
-</project>
diff --git a/testsuites/org.eclipse.birt.report.tests.engine/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.report.tests.engine/META-INF/MANIFEST.MF
index 7ec6a82f9f6..966ccf93e41 100644
--- a/testsuites/org.eclipse.birt.report.tests.engine/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.report.tests.engine/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.tests.engine; singleton:=true
-Bundle-ClassPath: test-engine.jar
+Bundle-ClassPath: .
 Bundle-Version: 4.17.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.tests.engine.plugin.EnginePlugin
 Bundle-ActivationPolicy: lazy
diff --git a/testsuites/org.eclipse.birt.report.tests.engine/build.properties b/testsuites/org.eclipse.birt.report.tests.engine/build.properties
index 8278e01cf3c..a30160ac06c 100644
--- a/testsuites/org.eclipse.birt.report.tests.engine/build.properties
+++ b/testsuites/org.eclipse.birt.report.tests.engine/build.properties
@@ -10,15 +10,14 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                test.xml,\
                about.html,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-
-jars.compile.order = test-engine.jar
-source.test-engine.jar = src/
-output.test-engine.jar = target/classes/
 src.includes = BIRT API Test Reference.doc,\
                about.html,\
                build.xml,\
diff --git a/testsuites/org.eclipse.birt.report.tests.model/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.report.tests.model/META-INF/MANIFEST.MF
index 0485994450c..a6e9d3d7e49 100644
--- a/testsuites/org.eclipse.birt.report.tests.model/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.report.tests.model/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.tests.model; singleton:=true
 Bundle-Version: 4.17.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.tests.model.plugin.ModelPlugin
-Bundle-ClassPath: tests-model.jar
+Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.junit;bundle-version="4.13.0";resolution:=optional,
  org.eclipse.birt.report.model;bundle-version="4.13.0",
diff --git a/testsuites/org.eclipse.birt.report.tests.model/build.properties b/testsuites/org.eclipse.birt.report.tests.model/build.properties
index f7330260501..9e703d998cb 100644
--- a/testsuites/org.eclipse.birt.report.tests.model/build.properties
+++ b/testsuites/org.eclipse.birt.report.tests.model/build.properties
@@ -10,15 +10,15 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                plugin.xml,\
                test.xml,\
                about.html,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-jars.compile.order = tests-model.jar
-source.tests-model.jar = src/
-output.tests-model.jar = target/classes/
 src.includes = BIRT API Test Reference.doc,\
                about.html,\
                build.xml,\
diff --git a/testsuites/org.eclipse.birt.tests.core/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.tests.core/META-INF/MANIFEST.MF
index 37c91c18c5b..660adefe52a 100644
--- a/testsuites/org.eclipse.birt.tests.core/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.tests.core/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Require-Bundle: org.junit;bundle-version="4.13.0",
  org.eclipse.birt.report.engine;bundle-version="4.13.0",
  org.eclipse.birt.core;bundle-version="4.13.0"
 Export-Package: utility
-Bundle-ClassPath: .,
- utility.jar
+Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.tests.core
diff --git a/testsuites/org.eclipse.birt.tests.core/build.properties b/testsuites/org.eclipse.birt.tests.core/build.properties
index 64e4f012409..1788e87de8b 100644
--- a/testsuites/org.eclipse.birt.tests.core/build.properties
+++ b/testsuites/org.eclipse.birt.tests.core/build.properties
@@ -10,16 +10,15 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                about.html,\
-               utility.jar,\
                lib/,\
                build.xml,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-jars.compile.order = utility.jar
-source.utility.jar = src/
-output.utility.jar = target/classes/
 src.includes = about.html,\
                build.xml,\
                lib/,\
diff --git a/testsuites/org.eclipse.birt.tests.data/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.tests.data/META-INF/MANIFEST.MF
index f0150ec313a..889af28c3e4 100644
--- a/testsuites/org.eclipse.birt.tests.data/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.tests.data/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.tests.data;singleton:=true
-Bundle-ClassPath: DtEtests.jar
+Bundle-ClassPath: .
 Bundle-Version: 4.17.0.qualifier
 Bundle-Activator: org.eclipse.birt.tests.data.engine.plugin.DataPlugin
 Require-Bundle: org.junit;bundle-version="4.13.0";resolution:=optional,
diff --git a/testsuites/org.eclipse.birt.tests.data/build.properties b/testsuites/org.eclipse.birt.tests.data/build.properties
index a4d29736ae2..4f7d4f58033 100644
--- a/testsuites/org.eclipse.birt.tests.data/build.properties
+++ b/testsuites/org.eclipse.birt.tests.data/build.properties
@@ -11,14 +11,14 @@
 # *   See git history
 # *******************************************************************************/
 
-bin.includes = META-INF/,\
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                test.xml,\
                about.html,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-jars.compile.order = DtEtests.jar
-source.DtEtests.jar = src/
-output.DtEtests.jar = target/classes/
 src.includes = BIRT API Test Reference.doc,\
                about.html,\
                pom.xml,\
diff --git a/testsuites/org.eclipse.birt.tests.data/src/plugins/org.eclipse.birt.thirdparty.aggregation/plugin.xml b/testsuites/org.eclipse.birt.tests.data/src/plugins/org.eclipse.birt.thirdparty.aggregation/plugin.xml
index d7b857e2b44..142cf301eb0 100644
--- a/testsuites/org.eclipse.birt.tests.data/src/plugins/org.eclipse.birt.thirdparty.aggregation/plugin.xml
+++ b/testsuites/org.eclipse.birt.tests.data/src/plugins/org.eclipse.birt.thirdparty.aggregation/plugin.xml
@@ -19,14 +19,6 @@
    name="Aggr"
    version="1.0.1"
    provider-name="Eclipse.org">
-      <runtime>
-      <library name="aggregation.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.birt.data"/>
-   </requires>
    
    <extension
          point="org.eclipse.birt.data.aggregation">
diff --git a/viewer/org.eclipse.birt.integration.wtp.ui/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.integration.wtp.ui/META-INF/MANIFEST.MF
index 37b1e23fe5b..c59020abec6 100644
--- a/viewer/org.eclipse.birt.integration.wtp.ui/META-INF/MANIFEST.MF
+++ b/viewer/org.eclipse.birt.integration.wtp.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.integration.wtp.ui;singleton:=true
 Bundle-Version: 4.17.0.qualifier
-Bundle-ClassPath: birtwtp.jar,.
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.integration.wtp.ui.BirtWTPUIPlugin
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/viewer/org.eclipse.birt.integration.wtp.ui/build.properties b/viewer/org.eclipse.birt.integration.wtp.ui/build.properties
index 4d4f7ce2153..ee53dcf5be5 100644
--- a/viewer/org.eclipse.birt.integration.wtp.ui/build.properties
+++ b/viewer/org.eclipse.birt.integration.wtp.ui/build.properties
@@ -10,16 +10,15 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
-bin.includes = META-INF/,\
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
                plugin.xml,\
                icons/,\
                templates/,\
                plugin.properties,\
                runtime/,\
                about.html,\
-               schema/,\
-               birtwtp.jar
-src.includes = about.html
-jars.compile.order = birtwtp.jar
-source.birtwtp.jar = src/
-output.birtwtp.jar = target/classes/
+               schema/
+src.includes = about.html
\ No newline at end of file
diff --git a/viewer/org.eclipse.birt.report.viewer/Build_Web_Viewer_Instruction_For_BIRT2.2.html b/viewer/org.eclipse.birt.report.viewer/Build_Web_Viewer_Instruction_For_BIRT2.2.html
deleted file mode 100644
index 4f806e03647..00000000000
--- a/viewer/org.eclipse.birt.report.viewer/Build_Web_Viewer_Instruction_For_BIRT2.2.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<meta http-equiv="Content-Type" content="text/html; charset=gb2312">
-<title>README</title>
-</head>
-
-<body>
-
-<p><b><font size="+2" face="Tahoma">README</font></b></p>
-<p><font face="Tahoma">Last Updated: June 20, 2007</font></p>
-<p><font face="Tahoma">This document describes how to generate a web viewer 
-which can work in Standalone Tomcat <span lang="zh-cn">from BIRT 2.2 source 
-code.</span></font></p>
-<p><font face="Tahoma"><br>
-<b>Table of Contents</b><br>
-¡¡</font></p>
-<p><font face="Tahoma"><a href="#description">Description</a><br>
-<a href="#prereq">Prerequisites</a><br>
-<a href="#setup">Setup</a><br>
-¡¡</font></p>
-<p><font face="Tahoma"><b><a name="description">Description</a></b></font></p>
-<p><font face="Tahoma">Ant script WebViewerPackager.xml under 
-org.eclipse.birt.report.viewer can be used to help building web viewer.<br>
-The web viewer depends on BIRT releng tools org.eclipse.birt.releng.birtbuilder.<br>
-Api jar under WEB-INF/lib will be generated during the process of running 
-org.eclipse.birt.releng.birtbuilder.</font></p>
-<p><font face="Tahoma">Please refer to Readme.html under project 
-org.eclipse.birt.releng.birtbuilder first.<br>
-¡¡</font></p>
-<p><font face="Tahoma"><b><a name="prereq">Prerequisites</a></b></font></p>
-<p><font face="Tahoma">1. Install Eclipse platform/GEF/EMF/DTP projects</font></p>
-<p><font face="Tahoma">2. Download Obit release(
-<a href="http://download.eclipse.org/tools/orbit/downloads">
-http://download.eclipse.org/tools/orbit/downloads</a> ) and extract following 
-bundles to the plugins folder of eclipse home:<br>
-org.apache.batik.bridge<br>
-org.apache.batik.css<br>
-org.apache.batik.dom<br>
-org.apache.batik.dom.svg<br>
-org.apache.batik.ext.awt<br>
-org.apache.batik.extension<br>
-org.apache.batik.parser<br>
-org.apache.batik.pdf<br>
-org.apache.batik.svggen<br>
-org.apache.batik.swing<br>
-org.apache.batik.transcoder<br>
-org.apache.batik.util<br>
-org.apache.batik.util.gui<br>
-org.apache.batik.xml<br>
-org.apache.xml.resolver<br>
-org.apache.xerces<br>
-org.w3c.css.sac <br>
-org.w3c.dom.svg<br>
-org.w3c.dom.smil</font><br>
-<br>
-¡¡</p>
-<p><font face="Tahoma"><b><a name="setup">Setup</a><br>
-¡¡</b></font></p>
-<p><font face="Tahoma">1. Download project org.eclipse.birt.releng.birtbuilder. 
-Follow the steps in Readme.html under it to create birt-report-framework 
-package. The api jars will be created in this process which are needed by 
-following steps. <br>
-After the build finished, extract the generated birt-report-framework-*.zip 
-<span lang="zh-cn">and birt-third-party*.zip </span>to 
-directory &lt;integrated.dir&gt;</font></p>
-<p><font face="Tahoma"><br>
-Note: BIRT source code do not need to be checked out manually. They will be 
-checked out during build process of org.eclipse.birt.releng.birtbuilder.<br>
-And users can import projects &lt;buildDirectory&gt;/plugins into workspace for 
-modification directly. The rerun of the build won't overwrite the changes made 
-in the &lt;buildDirectory&gt;/plugins.</font></p>
-<p><font face="Tahoma"><br>
-2. Switch to the &lt;buildDirectory&gt;/plugins/org.eclipse.birt.report.viewer 
-directory. &lt;buildDirectory&gt; is the working dir of Step 1.</font></p>
-<p><font face="Tahoma">Use Ant Build to call Jar target in WebViewerPackager.xml 
-to create web viewer framework:<br>
-ant -f WebViewerPackager.xml Jar -DbaseLocation=&lt;eclipse home&gt; -Dintegrated.dir=&lt;integrated.dir&gt;<br>
-When build is successful, birt_web is created under root of viewer plugin, and 
-web viewer framework is put under birt_web.</font></p>
-<p><font face="Tahoma">Make sure following property  have been set value when 
-running from ant:<br>
-baseLocation - set to the directory where 
-prerequisites</a> Eclipse platform locates<br>
-integrated.dir - set to the directory where birt bundles generated in step1 are 
-locales <br>
-<br>
-¡¡</font></p>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF
index 806428329dd..fd8672543ba 100644
--- a/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF
+++ b/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.viewer; singleton:=true
 Bundle-Version: 4.17.0.qualifier
 Bundle-ClassPath: .,
- viewer.jar,
  birt/WEB-INF/lib/viewservlets.jar
 Bundle-Activator: org.eclipse.birt.report.viewer.ViewerPlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml b/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml
deleted file mode 100644
index e0098f48e6d..00000000000
--- a/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml
+++ /dev/null
@@ -1,831 +0,0 @@
-<?xml version="1.0"?>
-<!--
- *************************************************************************
- * Copyright (c) 2004, 2005 Actuate Corporation.
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- *
- * Contributors:
- *  Actuate Corporation  - initial API and implementation
- *  
- *************************************************************************
- *
- *  Build.xml
- *
- *  Created on 03/15/2005
- *  Build script for project org.eclipse.birt.report.viewer
- *
- * 
- * The following are public targets callable by external users. 
- * 
- * "Clean" - Clean all objects created by this script. Individual project build script can not call this target; 
- * "Jar" - Compile source code and generate jar for this project.
- *          The compile dependency on other projects should be defined explicitly.
- *         baseLocation should be passed in when Individual project build script  call this target; 
- *          the property of "failonerror" should be set true(default) when compiling source code
- * "UnitTest" - Run unit tests. This task must be called after calling Jar task, 
- *              so it needn't depend on Jar explicitly
- * "Export" - Export the project, for instance, jar files are copied to a designated folder. 
- *            this task must be called after calling Jar task, so it needn't depend on Jar explicitly
- * "ExportWAR" - Export the project as an deployable war format
- * "JavaDoc" - generate java documents
- *
- * Usage:
- *    ant [any one or more of the public targets] 
- *        -DbaseLocation=<your eclipse home> 
- *        -Ddtp.home=<your DTP plugins source home>   [optional]
- *
- * Default target is "Jar".
- *
- * 
- * This script may also additional targets. These targets are private to this build script only. 
- *
- * 
- *
- * Notes:
- *  1. classpath need to be set for junit.jar
- *  2. This file now requires Ant 1.6
- *
- * Change History:
- *
- *    1. 03/15/2005: initial version
- *
--->
-
-<project name="BIRT Web Viewer" default="Jar" basedir=".">
-
-	<description>Web Viewer Packager</description>
-	<!-- set global properties for this build -->
-	<!-- Public properties, used by public targets, top level build script
-			     will pass on the value at runtime. Properties will have there default
-			     value.
-			     baseLocation
-			     utest.report.dir
-			     javadoc.dir
-			     plugin.version 
-		-->
-	<property name="dtp.home" location=".." />
-	<property name="utest.report.dir" location="utestreports" />
-	<property name="javadoc.dir" location="docs/api" />
-	<property name="export.dir" location="export" />
-
-	<!-- Compiler properties -->
-	<!--property name="compilerArg" value="" /-->
-
-	<!-- Eclipse related. Default version 3.0.0 -->
-	<property name="plugin.runtime" value="org.eclipse.core.runtime" />
-	<property name="plugin.emf.ecore" value="org.eclipse.emf.ecore" />
-	<property name="plugin.emf.ecore.xml" value="org.eclipse.emf.ecore.xmi" />
-	<property name="plugin.emf.common" value="org.eclipse.emf.common" />
-	<property name="plugin.osgi" value="org.eclipse.osgi" />
-	<property name="plugin.help.appserver" value="org.eclipse.help.appserver" />
-	<property name="plugin.help.base" value="org.eclipse.help.base" />
-	<property name="plugin.swt" value="org.eclipse.swt" />
-	<property name="plugin.jface" value="org.eclipse.jface" />
-	<property name="plugin.equinox" value="org.eclipse.equinox" />
-
-	<!-- Component locations -->
-	<property name="chart-engine.dir" location="../org.eclipse.birt.chart.engine" />
-	<property name="data-extraction.dir" location="../org.eclipse.birt.report.engine.dataextraction" />
-	<property name="data-adapter-api.dir" location="../org.eclipse.birt.report.data.adapter" />
-
-	<property name="buildDirectory" value="${eclipse.home}"/>
-	<property name="baseLocation" value="${eclipse.home}"/>
-	<property name="baseLocation.emf" value="${baseLocation}"/>
-	<!-- Libararies -->
-	<property name="codec.jar" value="lib/commons-codec-1.3.jar" />
-	<property name="js.jar" value="lib/js.jar" />
-	<property name="module.name" value="org.eclipse.birt.report.viewer" />
-	<property name="birt.dir" value="birt_web" />
-	<property name="birt.dir.OSGI" value="birt_web_OSGI" />
-	<property name="birt.dir.original" value="birt" />
-
-	<!-- set platform related properties-->
-	<condition property="basews" value="win32">
-		<os family="windows" />
-	</condition>
-	<condition property="basews" value="gtk">
-		<not>
-			<os family="windows" />
-		</not>
-	</condition>
-
-
-	<!-- Compile source code and generate jar for this project-->
-	<target name="Jar" depends="build-nonprecompile, precompile" description="Build everying.">
-		<delete dir="${temp.folder}" />
-	</target>
-
-	<target name="Jar_OSGI" depends="build-nonprecompile_OSGI, precompile_OSGI" description="Build everying.">
-		<delete dir="${temp.folder}" />
-	</target>
-
-	<target name="build-nonprecompile" depends="enginesdk,viewservlets">
-		<delete dir="${temp.folder}" />
-	</target>
-
-	<target name="build-nonprecompile_OSGI" depends="enginesdk_OSGI,extensions,viewservlets_OSGI">
-		<delete dir="${temp.folder}" />
-	</target>
-
-	<!-- build init -->
-	<target name="init">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder" />
-		</condition>
-		<property name="pluginTemp" value="${basedir}" />
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.birt.report.viewer">
-			<isset property="buildTempFolder" />
-		</condition>
-		<property name="build.result.folder" value="${basedir}" />
-		<property name="temp.folder" value="${basedir}/temp.folder" />
-		<property name="plugin.destination" value="${basedir}" />
-
-		<delete dir="${build.result.folder}/${birt.dir}" />
-		<copy todir="${build.result.folder}/${birt.dir}">
-			<fileset dir="${build.result.folder}/${birt.dir.original}" />
-		</copy>
-	</target>
-	
-	<target name="init_OSGI">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder" />
-		</condition>
-		<property name="pluginTemp" value="${basedir}" />
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.birt.report.viewer">
-			<isset property="buildTempFolder" />
-		</condition>
-		<property name="build.result.folder" value="${basedir}" />
-		<property name="temp.folder" value="${basedir}/temp.folder" />
-		<property name="plugin.destination" value="${basedir}" />
-
-		<delete dir="${build.result.folder}/${birt.dir.OSGI}" />
-		<copy todir="${build.result.folder}/${birt.dir.OSGI}">
-			<fileset dir="${build.result.folder}/${birt.dir.original}" />
-		</copy>
-	</target>
-
-	<!-- Clean up web viewer -->
-	<target name="Clean" depends="init" description="Clean the plug-in.">
-		<delete includeemptydirs="true">
-			<fileset dir="${build.result.folder}/${birt.dir}/WEB-INF/lib" includes="**/*" />
-			<fileset dir="${build.result.folder}/${birt.dir}/WEB-INF/classes" includes="**/*.class" />
-		</delete>
-		<delete dir="${temp.folder}" />
-	</target>
-
-	<!-- Export the project, for instance, jar files are copied to a designated folder
-						 the dependency on Jar should implement in top level script by call sequence	
-						 Parameters:
-						 		- ${export.dir} target directory to put the plugin binaries
-						 		- ${plugin.version} the version of plugin exported
-		-->
-	<target name="Export">
-		<property file="META-INF/MANIFEST.MF" />
-		<property name="plugin.package" value="${module.name}" />
-		<echo message="Export Web Viewer version = ${Bundle-Version}" />
-
-		<copy todir="${export.dir}/${plugin.package}" failonerror="false">
-			<fileset dir="." includes="viewer.jar,about.html,plugin.xml,META-INF/**,schema/**,${birt.dir}/**" excludes="${birt.dir}/WEB-INF/classes/**,${birt.dir}/images/**,${birt.dir}/pages/**,${birt.dir}/styles/**,${birt.dir}/plugins/**" />
-		</copy>
-	</target>
-
-	<target name="Export_OSGI">
-		<property file="META-INF/MANIFEST.MF" />
-		<property name="plugin.package" value="${module.name}" />
-		<echo message="Export Web Viewer OSGI version = ${Bundle-Version}" />
-
-		<copy todir="${export.dir}/${plugin.package}" failonerror="false">
-			<fileset dir="." includes="viewer.jar,about.html,plugin.xml,META-INF/**,schema/**,${birt.dir.OSGI}/**" excludes="${birt.dir.OSGI}/WEB-INF/classes/**,${birt.dir.OSGI}/images/**,${birt.dir.OSGI}/pages/**,${birt.dir.OSGI}/styles/**,${birt.dir.OSGI}/plugins/**" />
-		</copy>
-	</target>
-
-
-	<!-- 
-		    Export the project as a single WAR format file
-		    Parameters:
-		    	- ${export.dir} target directory to put WAR format file
-		-->
-	<target name="ExportWAR" depends="Jar">
-		<jar destfile="birt.war">
-			<fileset dir="${build.result.folder}/${birt.dir}">
-				<include name="*.*" />
-				<include name="*/**" />
-			</fileset>
-		</jar>
-	</target>
-
-	<!-- public task UnitTest will not explicitly depend on complie, Top level script should call compile before calling UnitTest -->
-	<!-- Run Unit test.
-					 Parameters:
-					 		- ${utest.report.dir} target directory to put the unit test report
-		-->
-	<target name="UnitTest" description="run all the unit tests" />
-
-
-	<!-- Generate the JavaDoc.
-			 Parameters:
-			 		- ${javadoc.dir} target directory to put the java document
-		 -->
-	<target name="Javadoc" depends="init">
-		<mkdir dir="${javadoc.dir}" />
-		<javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="BIRT Viewer Project" source="1.8" executable="${jvm16_home}/bin/javac" packagenames="${module.name}.*">
-			<classpath>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="${plugin.runtime}_*/runtime.jar" />
-					<include name="${plugin.equinox}*.jar" />
-					<include name="${plugin.osgi}_*/*.jar" />
-					<include name="${plugin.osgi}_*/eclipseAdaptor.jar" />
-					<include name="${plugin.swt}.${basews}_*/ws/${basews}/swt.jar" />
-					<include name="${plugin.swt}*.jar" />
-					<include name="${plugin.jface}_*/jface.jar" />
-					<include name="${plugin.jface}_*.jar" />
-					<include name="${plugin.help.base}_*/helpbase.jar" />
-					<include name="${plugin.help.base}*.jar" />
-					<include name="${plugin.help.appserver}_*/appserver.jar" />
-					<include name="${plugin.help.appserver}*.jar" />
-					<include name="javax.servlet*.jar" />
-					<include name="org.apache.jasper*.jar" />
-					<include name="org.apache.commons.logging*.jar" />
-					<include name="com.ibm.icu_*.jar" />
-				</fileset>
-				<pathelement path="${build.result.folder}/${birt.dir}/WEB-INF/lib/model.jar" />
-				<pathelement path="${build.result.folder}/${birt.dir}/WEB-INF/lib/engine.jar" />
-				<pathelement path="${build.result.folder}/${birt.dir}/WEB-INF/lib/core.jar" />
-			</classpath>
-			<packageset dir="src" defaultexcludes="yes" />
-			<packageset dir="${birt.dir}/WEB-INF/classes" defaultexcludes="yes" />
-			<bottom>
-				<![CDATA[<i>Copyright &#169;  2005 Actuate Corp. All rights reserved. </i>]]></bottom>
-	</javadoc>
-</target>
-
-
-
-<!-- build engine sdk -->
-<target name="enginesdk" depends="init">
-	<delete dir="${temp.folder}" />
-
-	<mkdir dir="${build.result.folder}/${birt.dir}/WEB-INF/platform"/>
-	
-	<!-- prepare non-osgi reportengine/lib jars -->
-	
-	<antcall target="ExportEngineSDK">
-	    <param name="export.dir" value="${build.result.folder}/${birt.dir}/WEB-INF/platform"/>
-	</antcall>
-	
-	<property file="${buildDirectory}/finalPluginsVersions.properties" />
-	<copy todir="${build.result.folder}/${birt.dir}/WEB-INF/lib">
-		<fileset dir="${build.result.folder}/${birt.dir}/WEB-INF/platform/lib/">
-			<include name="*.jar" />
-		</fileset>		
-		<!-- Copy axis related jars -->
-		<fileset dir="${buildDirectory}/plugins/org.apache.axis_${org.apache.axis}/lib" >
-			<include name="*.jar"/>
-		</fileset>
-		<fileset dir="${buildDirectory}/plugins/javax.xml.rpc_${javax.xml.rpc}/lib" >
-			<include name="*.jar"/>
-		</fileset>
-		<fileset dir="${buildDirectory}/plugins/javax.xml.soap_${javax.xml.soap}/lib" >
-			<include name="*.jar"/>
-		</fileset>	
-		<fileset dir="${buildDirectory}/plugins/org.apache.commons.discovery_${org.apache.commons.discovery}/lib" >
-			<include name="*.jar"/>
-		</fileset>
-	</copy>
-	
-	<copy todir="${build.result.folder}/${birt.dir}/WEB-INF/platform/lib">
-		<fileset dir="${build.result.folder}/${birt.dir}/WEB-INF/lib">
-			<include name="org.eclipse.birt.runtime_*.jar"/>
-			<include name="org.eclipse.datatools_*.jar"/>
-		</fileset>
-	</copy>
-	
-</target>
-
-<target name="enginesdk_OSGI" depends="init_OSGI">
-	<delete dir="${temp.folder}" />
-
-	<mkdir dir="${build.result.folder}/${birt.dir.OSGI}/WEB-INF/platform" />
-	<antcall target="ExportEngineSDK_OSGI">
-	    <param name="export.dir" value="${build.result.folder}/${birt.dir.OSGI}/WEB-INF/platform"/>
-	</antcall>
-
-	<property file="${buildDirectory}/finalPluginsVersions.properties" />
-	<copy todir="${build.result.folder}/${birt.dir.OSGI}/WEB-INF/lib">
-		<fileset dir="${build.result.folder}/${birt.dir.OSGI}/WEB-INF/platform/lib/">
-			<include name="*.jar" />
-		</fileset>
-
-		<!-- Copy dataextraction jar -->
-		<fileset dir="${data-extraction.dir}">
-			<include name="dataextraction.jar" />
-		</fileset>
-
-		<!-- Copy axis related jars -->
-		<fileset dir="${buildDirectory}/plugins/org.apache.axis_${org.apache.axis}/lib" >
-			<include name="*.jar"/>
-		</fileset>
-		<fileset dir="${buildDirectory}/plugins/javax.xml.rpc_${javax.xml.rpc}/lib" >
-			<include name="*.jar"/>
-		</fileset>
-		<fileset dir="${buildDirectory}/plugins/javax.xml.soap_${javax.xml.soap}/lib" >
-			<include name="*.jar"/>
-		</fileset>
-		<fileset dir="${buildDirectory}/plugins/org.apache.commons.discovery_${org.apache.commons.discovery}/lib" >
-			<include name="*.jar"/>
-		</fileset>
-		<fileset dir="${buildDirectory}/plugins" >
-			<include name="javax.wsdl_1.5*.jar"/>
-		</fileset>
-	</copy>
-</target>
-
-<!-- Prepare viewer servlet jars -->
-<target name="viewservlets" depends="init">
-	<delete dir="${temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" />
-	<mkdir dir="${temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" />
-	<javac destdir="${temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" source="1.8" target="1.8" executable="${jvm16_home}/bin/javac" fork="yes" debug="true">
-		<!--compilerarg line="${compilerArg}" /-->
-		<classpath>
-			<fileset dir="${baseLocation}/plugins">
-				<include name="javax.servlet*.jar" />
-				<include name="org.apache.jasper*.jar" />
-				<include name="org.apache.commons.logging*.jar" />
-				<include name="javax._1.5*.jar"/>
-			</fileset>
-			<fileset dir="${buildDirectory}/plugins" >
-				<include name="org.apache.axis_*/lib/*.jar"/>
-				<include name="javax.xml.rpc_*/lib/*.jar"/>
-				<include name="javax.xml.soap_*/lib/*.jar"/>
-				<include name="org.apache.commons.discovery_*/lib/*.jar"/>		
-				<include name="org.apache.commons.codec*.jar" />
-				<include name="org.mozilla.rhino_*.jar"/>
-			</fileset>
-			<fileset dir="${build.result.folder}/${birt.dir}/WEB-INF/lib">
-				<include name="*.jar" />
-			</fileset>
-		</classpath>
-		<src path="${birt.dir}/WEB-INF/classes/" />
-	</javac>
-	<copy todir="${temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" failonerror="true">
-		<fileset dir="${birt.dir}/WEB-INF/classes/" excludes="**/*.java, **/package.htm*" />
-	</copy>
-	<mkdir dir="${build.result.folder}/${birt.dir}/WEB-INF/lib" />
-	<jar jarfile="${build.result.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar" basedir="${temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" />
-	<delete dir="${temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" />
-</target>
-
-<target name="viewservlets_OSGI" depends="init_OSGI">
-	<delete dir="${temp.folder}/${birt.dir.OSGI}/WEB-INF/lib/viewservlets.jar.bin" />
-	<mkdir dir="${temp.folder}/${birt.dir.OSGI}/WEB-INF/lib/viewservlets.jar.bin" />
-	<javac destdir="${temp.folder}/${birt.dir.OSGI}/WEB-INF/lib/viewservlets.jar.bin" source="1.8" target="1.8" executable="${jvm16_home}/bin/javac" fork="yes" debug="true">
-		<!--compilerarg line="${compilerArg}" /-->
-		<classpath>
-			<fileset dir="${baseLocation}/plugins">
-				<include name="javax.servlet*.jar" />
-				<include name="org.apache.jasper*.jar" />
-				<include name="org.apache.commons.logging*.jar" />
-				<include name="javax._1.5*.jar"/>
-			</fileset>
-			<fileset dir="${buildDirectory}/plugins" >
-				<include name="org.apache.axis_*/lib/*.jar"/>
-				<include name="javax.xml.rpc_*/lib/*.jar"/>
-				<include name="javax.xml.soap_*/lib/*.jar"/>
-				<include name="org.apache.commons.discovery_*/lib/*.jar"/>
-				<include name="org.apache.commons.codec*.jar" />
-				<include name="org.mozilla.rhino_*.jar"/>
-			</fileset>
-			<fileset dir="${build.result.folder}/${birt.dir.OSGI}/WEB-INF/lib">
-				<include name="*.jar" />
-			</fileset>
-			<fileset dir="${data-adapter-api.dir}">
-				<include name="*.jar" />
-			</fileset>
-		</classpath>
-		<src path="${birt.dir.OSGI}/WEB-INF/classes/" />
-	</javac>
-	<copy todir="${temp.folder}/${birt.dir.OSGI}/WEB-INF/lib/viewservlets.jar.bin" failonerror="true">
-		<fileset dir="${birt.dir.OSGI}/WEB-INF/classes/" excludes="**/*.java, **/package.htm*" />
-	</copy>
-	<mkdir dir="${build.result.folder}/${birt.dir.OSGI}/WEB-INF/lib" />
-	<jar jarfile="${build.result.folder}/${birt.dir.OSGI}/WEB-INF/lib/viewservlets.jar" basedir="${temp.folder}/${birt.dir.OSGI}/WEB-INF/lib/viewservlets.jar.bin" />
-	<delete dir="${temp.folder}/${birt.dir.OSGI}/WEB-INF/lib/viewservlets.jar.bin" />
-</target>
-
-
-<!-- Prepare some extension and eclipse jars -->
-<target name="extensions">
-	<copy todir="${build.result.folder}/${birt.dir.OSGI}/WEB-INF/lib" failonerror="true">
-		<fileset dir="${chart-engine.dir}">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="${baseLocation.emf}/plugins">
-			<include name="org.eclipse.emf.common_*.jar" />
-			<include name="org.eclipse.emf.ecore.xmi_*.jar" />
-			<include name="org.eclipse.emf.ecore_*.jar" />
-		</fileset>
-	</copy>
-</target>
-
-<!-- Precompile the jsp pages -->
-<target name="precompile" depends="init" description="Precompile jsp pages.">
-</target>
-
-<target name="precompile_OSGI" depends="init_OSGI" description="Precompile jsp pages.">
-</target>
-
-	<!-- Export Engine SDK -->
-	<target name="ExportEngineSDK">
-	
-		<mkdir dir="${export.dir}/lib" />
-	
-		<!-- copy plugins needed in the system fold ./eclipse/plugins into the directory -->
-		<copy todir="${export.dir}/lib" overwrite="true">
-			<fileset dir="${baseLocation}/plugins">
-				<include name="com.ibm.icu_*.jar" />
-				<include name="org.eclipse.core.contenttype_*.jar" />
-				<include name="org.eclipse.core.jobs_*.jar" />
-				<include name="org.eclipse.core.runtime_*.jar" />
-				<include name="org.eclipse.core.resources_*.jar"/>
-				<include name="org.eclipse.core.expressions_*.jar"/>
-				<include name="org.eclipse.core.filesystem_*.jar"/>
-				<include name="org.eclipse.equinox.app_*.jar"/>
-				<include name="org.eclipse.equinox.common_*.jar" />
-				<include name="org.eclipse.equinox.preferences_*.jar" />
-				<include name="org.eclipse.equinox.registry_*.jar" />
-				<include name="org.eclipse.osgi_*.jar" />
-				<include name="org.eclipse.osgi.services_*.jar"/>
-				<include name="org.eclipse.update.configurator_*.jar" />
-				<include name="javax.wsdl_1.5*.jar" />
-				<include name="org.apache.xerces_*.jar" />
-				<include name="org.apache.xml.resolver_*.jar" />
-	            <include name="org.apache.xml.serializer_*.jar" />
-				<include name="org.eclipse.emf.common_*.jar" />
-				<include name="org.eclipse.emf.ecore.xmi_*.jar" />
-				<include name="org.eclipse.emf.ecore.change_*.jar"/>
-				<include name="org.eclipse.emf.ecore_*.jar" />
-				<include name="org.eclipse.emf_*.jar" />
-				<include name="org.apache.commons.logging_*.jar" />
-				<include name="org.apache.derby_*.jar" />
-			</fileset>
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="org.w3c.dom_*.jar"/>
-				<include name="org.apache.batik.*jar"/>
-				<include name="org.eclipse.orbit.xml-apis-ext_*.jar"/>
-				<include name="org.w3c.dom.svg_*.jar"/>
-				<include name="org.w3c.dom.smil_*.jar"/>
-				<include name="org.w3c.css.sac_*.jar"/>
-				<include name="org.apache.commons.codec_*.jar"/>
-				<include name="javax.xml.stream_*.jar"/>
-				<include name="org.eclipse.orbit.mongodb_*.jar"/>
-				<include name="org.apache.poi_*.jar"/>
-			</fileset>
-			<fileset dir="../org.eclipse.birt.report.engine/lib">
-				<include name="*.jar"/>
-			</fileset>
-			<fileset dir="../org.w3c.sac/lib">
-				<include name="*.jar"/>
-			</fileset>
-			<fileset dir="${integrate.dir}/plugins">
-				<include name="com.lowagie.text_*/**" />
-			</fileset>
-			<!-- datatools plugins -->
-			<fileset dir="${baseLocation}/plugins">
-		    	<include name="org.eclipse.datatools.connectivity_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.apache.derby_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.apache.derby.dbdefinition_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.console.profile_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.db.generic_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.dbdefinition.genericJDBC_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.oda_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.oda.consumer_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.oda.design_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.oda.flatfile_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.oda.profile_*/**"/>
-		    	<include name="org.eclipse.datatools.connectivity.sqm.core_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.oda.ws_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.oda.xml_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.oracle_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.oracle.dbdefinition_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.postgresql_*/**"/>
-				<include name="org.eclipse.datatools.enablement.postgresql.dbdefinition_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.hsqldb_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.hsqldb.dbdefinition_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.ibm.db2.luw_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.ibm.informix_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.ibm.informix.dbdefinition_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.msft.sqlserver_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.mysql_*/**"/>
-		    	<include name="org.eclipse.datatools.enablement.mysql.dbdefinition_*/**"/>
-		    	<include name="org.eclipse.datatools.modelbase.dbdefinition_*/**"/>
-		    	<include name="org.eclipse.datatools.modelbase.derby_*/**"/>
-		    	<include name="org.eclipse.datatools.modelbase.sql_*/**"/>
-		    	<include name="org.eclipse.datatools.modelbase.sql.query_*/**"/>
-			</fileset>
-		</copy>	
-		<copy todir="${export.dir}/lib">
-			<fileset dir="${integrate.dir}/plugins" />
-			<mapper type="regexp"  from="org.mozilla.rhino_.*.jar" to="js.jar"/>
-		</copy>
-
-	</target>
-	
-	<target name="ExportEngineSDK_OSGI">
-		<mkdir dir="${export.dir}" />
-
-		<mkdir dir="${export.dir}/configuration" />
-		<!-- copy config.ini to configuration/config.ini-->
-		<copy todir="${export.dir}/configuration">
-			<fileset dir="../org.eclipse.birt.report.engine/sdk">
-				<include name="config.ini" />
-			</fileset>
-		</copy>
-
-		<!-- copy plugins needed in the system fold ./eclipse/plugins into the directory -->
-		<mkdir dir="${export.dir}/plugins" />
-
-		<copy todir="${export.dir}/plugins" overwrite="true">
-		<fileset dir="${baseLocation}/plugins">
-			<include name="org.junit_*/**" />
-			<include name="com.ibm.icu_*.jar" />
-			<include name="org.eclipse.core.contenttype_*.jar" />
-			<include name="org.eclipse.core.jobs_*.jar" />
-			<include name="org.eclipse.core.runtime_*.jar" />
-			<include name="org.eclipse.core.resources_*.jar"/>
-			<include name="org.eclipse.core.expressions_*.jar"/>
-			<include name="org.eclipse.core.filesystem_*.jar"/>
-			<include name="org.eclipse.equinox.app_*.jar"/>
-			<include name="org.eclipse.equinox.common_*.jar" />
-			<include name="org.eclipse.equinox.preferences_*.jar" />
-			<include name="org.eclipse.equinox.registry_*.jar" />
-			<!-- <include name="org.eclipse.equinox.servlet.api_*.jar"/> -->
-			<include name="org.eclipse.osgi_*.jar" />
-			<include name="org.eclipse.osgi.services_*.jar"/>
-			<include name="org.eclipse.update.configurator_*.jar" />
-			<include name="org.apache.commons.logging_*.jar" />
-			<!-- DTP bundles -->
-			<include name="org.eclipse.datatools.connectivity_*.jar" />
-		    <include name="org.eclipse.datatools.connectivity.apache.derby_*.jar" />
-		    <include name="org.eclipse.datatools.connectivity.apache.derby.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.console.profile_*.jar"/>
-		    <include name="org.eclipse.datatools.connectivity.db.generic_*.jar" />
-		    <include name="org.eclipse.datatools.connectivity.dbdefinition.genericJDBC_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.consumer_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.flatfile_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.profile_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda.design_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.oda_*.jar" />
-			<include name="org.eclipse.datatools.connectivity.sqm.core_*.jar" />
-			<include name="org.eclipse.datatools.enablement.hsqldb_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.hsqldb.dbdefinition_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.ibm.db2.luw_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition_*.jar" />
-			<include name="org.eclipse.datatools.enablement.ibm.db2.iseries_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition_*.jar"/>
-		    <include name="org.eclipse.datatools.enablement.ibm.db2.zseries_*.jar"/>
-		    <include name="org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.ibm.informix_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.ibm.informix.dbdefinition_*.jar"/>
-		    <include name="org.eclipse.datatools.enablement.msft.sqlserver_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.mysql_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.mysql.dbdefinition_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.oracle_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.oracle.dbdefinition_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.postgresql_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.postgresql.dbdefinition_*.jar"/>
-		    <include name="org.eclipse.datatools.enablement.sap.maxdb_*.jar" />
-		    <include name="org.eclipse.datatools.enablement.sap.maxdb.dbdefinition_*.jar"/>
-			<include name="org.eclipse.datatools.enablement.oda.xml_*.jar" />
-			<include name="org.eclipse.datatools.enablement.oda.ws_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.derby_*.jar" />
-			<include name="org.eclipse.datatools.modelbase.dbdefinition_*.jar" />
-		    <include name="org.eclipse.datatools.modelbase.sql_*.jar"/>
-			<include name="org.eclipse.datatools.modelbase.sql.query_*.jar"/>
-			<include name="javax.wsdl_1.5*.jar" />
-			<!-- xerces for DTP, may not be the same version as BIRT uses -->
-			<include name="org.apache.xerces_*.jar" />
-			<include name="org.apache.xml.resolver_*.jar" />
-            <include name="javax.xml_*.jar" />
-            <include name="org.apache.xml.serializer_*.jar" />
-		</fileset>
-		<fileset dir="${baseLocation.emf}/plugins">
-			<include name="org.eclipse.emf.common_*.jar" />
-			<include name="org.eclipse.emf.ecore.xmi_*.jar" />
-			<include name="org.eclipse.emf.ecore.change_*.jar"/>
-			<include name="org.eclipse.emf.ecore_*.jar" />
-			<include name="org.eclipse.emf_*.jar" />
-		</fileset>
-		<fileset dir="${buildDirectory}/plugins">
-			<include name="org.w3c.dom_*.jar"/>
-			<include name="org.apache.batik.*jar"/>
-			<include name="org.w3c.dom.svg_*.jar"/>
-			<include name="org.w3c.dom.smil_*.jar"/>
-			<include name="org.w3c.css.sac_*.jar"/>
-			<include name="org.apache.commons.codec_*.jar"/>
-			<include name="javax.xml.stream_*.jar"/>
-			<include name="org.eclipse.orbit.mongodb_*.jar"/>
-			<include name="org.apache.poi_*.jar"/>
-		</fileset>
-		</copy>
-
-		<copy todir="${export.dir}/plugins">
-		<fileset dir="${integrate.dir}/plugins">
-			<!-- 3rd party bundles -->
-			<include name="org.w3c.sac_*/**" />
-			<include name="org.mozilla.rhino_*/**" />
-			<include name="com.lowagie.text_*/**" />
-			<!-- birt bundles -->
-			<include name="org.eclipse.birt.chart.device.extension_*.jar" />
-			<include name="org.eclipse.birt.chart.device.svg_*.jar" />
-			<include name="org.eclipse.birt.chart.engine_*.jar" />
-			<include name="org.eclipse.birt.chart.engine.extension_*.jar" />
-			<include name="org.eclipse.birt.chart.reportitem_*.jar" />
-			<include name="org.eclipse.birt.chart.examples.core_*.jar" />
-			<include name="org.eclipse.birt.core_*.jar" />
-			<include name="org.eclipse.birt.core.script.function_*.jar" />
-			<include name="org.eclipse.birt.data_*.jar" />
-			<include name="org.eclipse.birt.data.aggregation_*.jar" />
-			<include name="org.eclipse.birt.data.oda.mongodb_*.jar" />
-			<include name="org.eclipse.birt.report.data.adapter_*.jar"/>
-			<include name="org.eclipse.birt.report.data.bidi.utils_*.jar" />
-			<include name="org.eclipse.birt.data.oda_*/**" />
-			<include name="org.eclipse.birt.report.data.oda.jdbc_*/**" />
-			<include name="org.eclipse.birt.report.data.oda.hive_*.jar" />
-			<include name="org.eclipse.birt.report.data.oda.excel_*.jar" />
-			<include name="org.eclipse.birt.report.data.oda.jdbc.dbprofile_*.jar" />
-			<include name="org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb_*.jar"/>
-			<include name="org.eclipse.birt.report.data.oda.sampledb_*/**" />
-			<include name="org.eclipse.birt.report.data.oda.xml_*.jar" />
-			<include name="org.eclipse.birt.report.engine_*.jar" />
-			<include name="org.eclipse.birt.report.engine.fonts_*/**" />
-			<include name="org.eclipse.birt.report.engine.emitter.html_*.jar" />
-			<include name="org.eclipse.birt.report.engine.emitter.pdf_*.jar" />
-			<include name="org.eclipse.birt.report.engine.emitter.postscript_*.jar" />
-			<include name="org.eclipse.birt.report.engine.emitter.wpml_*.jar" />
-			<include name="org.eclipse.birt.report.engine.emitter.prototype.excel_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.ppt_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.odp_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.ods_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.odt_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.odf_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.config_*.jar" />
-			<include name="org.eclipse.birt.report.engine.emitter.config.html_*.jar" />
-			<include name="org.eclipse.birt.report.engine.emitter.config.pdf_*.jar" />
-			<include name="org.eclipse.birt.report.engine.emitter.config.postscript_*.jar" />
-			<include name="org.eclipse.birt.report.engine.emitter.config.wpml_*.jar" />
-			<include name="org.eclipse.birt.report.engine.emitter.config.excel_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.config.ppt_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.config.odp_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.config.ods_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.config.odt_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.dataextraction_*.jar" />
-			<include name="org.eclipse.birt.report.engine.dataextraction.csv_*.jar" />
-			<include name="org.eclipse.birt.report.engine.script.javascript_*.jar" />
-			<include name="org.eclipse.birt.report.model_*.jar" />
-			<include name="org.eclipse.birt.report.model.adapter.oda_*.jar" />
-			<include name="org.eclipse.birt.report.item.crosstab.core_*.jar" />
-			<include name="org.eclipse.birt.report.engine.ooxml_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.config.docx_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.config.pptx_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.docx_*.jar"/>
-			<include name="org.eclipse.birt.report.engine.emitter.pptx_*.jar"/>
-			<include name="org.eclipse.birt.data.oda.pojo_*.jar"/>
-			<include name="uk.co.spudsoft.birt.emitters.excel_*/**"/>
-		</fileset>
-		</copy>
-
-		<mkdir dir="${export.dir}/lib" />
-		<copy todir="${export.dir}/lib">
-			<fileset dir="${export.dir}/plugins">
-				<include name="com.ibm.icu_*.jar" />
-			</fileset>
-		</copy>
-		<copy todir="${export.dir}/lib">
-		<fileset dir="../org.eclipse.birt.core">
-			<include name="coreapi.jar" />
-		</fileset>
-		<fileset dir="../org.eclipse.birt.data">
-			<include name="dteapi.jar" />
-		</fileset>
-		<fileset dir="../org.eclipse.birt.data.aggregation">
-			<include name="dataaggregationapi.jar" />
-		</fileset>
-		<fileset dir="../org.eclipse.birt.report.model">
-			<include name="modelapi.jar" />
-		</fileset>
-		<fileset dir="../org.eclipse.birt.report.model.adapter.oda">
-			<include name="modelodaapi.jar" />
-		</fileset>
-		<fileset dir="../org.eclipse.birt.report.model.adapter.oda/lib">
-			<include name="odadesignapi.jar" />
-		</fileset>
-		<fileset dir="../org.eclipse.birt.report.engine">
-			<include name="engineapi.jar" />
-			<include name="scriptapi.jar" />
-		</fileset>
-		<fileset dir="${data-extraction.dir}">
-			<include name="dataextraction.jar" />
-		</fileset>
-		<fileset dir="../org.eclipse.birt.report.data.adapter">
-			<include name="dataadapterapi.jar" />
-		</fileset>
-		<fileset dir="../org.eclipse.birt.report.item.crosstab.core">
-			<include name="crosstabcoreapi.jar" />
-		</fileset>
-		<fileset dir="../org.eclipse.birt.report.engine/lib">
-			<include name="commons-cli*.jar" />
-		</fileset>
-        <fileset dir="../org.eclipse.birt.report.engine.emitter.config">
-            <include name="emitterconfig.jar" />
-        </fileset>
-        <fileset dir="../org.eclipse.birt.chart.reportitem">
-            <include name="chartitemapi.jar" />
-        </fileset>
-        <fileset dir="../org.eclipse.birt.chart.examples.core">
-            <include name="chartexamplescoreapi.jar" />
-        </fileset>
-		<fileset dir="../org.w3c.sac/lib">
-			<include name="*.jar" />
-		</fileset>
-		<!-- Export Chart Engine -->
-		<fileset dir="${baseLocation.emf}/plugins/">
-			<include name="org.eclipse.emf.common_*.jar" />
-			<include name="org.eclipse.emf.ecore.xmi_*.jar" />
-			<include name="org.eclipse.emf.ecore_*.jar" />
-		</fileset>
-		<!-- Fix TED 52014 -->
-		<fileset dir="${buildDirectory}/${buildId}/eclipse/plugins/">
-			<include name="org.eclipse.birt.axis.overlay_*.jar" />
-		</fileset>
-		</copy>
-
-		<copy todir="${export.dir}/lib">
-			<fileset dir="${integrate.dir}/plugins" />
-			<mapper type="regexp"  from="org.eclipse.birt.chart.engine_.*.jar" to="chartengineapi.jar"/>
-		</copy>
-
-		<copy todir="${export.dir}/lib">
-			<fileset dir="${buildDirectory}/plugins" />
-			<mapper type="regexp"  from="org.mozilla.rhino_.*.jar" to="js.jar"/>
-		</copy>
-
-
-		<copy todir="${export.dir}/lib">
-			<!-- copy javax.servlet jar for generate birt.api fragment -->
-			<fileset dir="${baseLocation}/plugins" >
-				<include name="javax.servlet*.jar"/>
-			</fileset>
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="org.w3c.css.sac_*.jar"/>
-				<include name="org.apache.commons.codec_*.jar"/>
-			</fileset>
-		</copy>
-
-		<antcall target="replaceManifest"/>
-
-		<!-- copy javax.servlet jar for generate birt.api fragment -->
-		<delete>
-			<fileset dir="${export.dir}/lib">
-				<include name="javax.servlet*.jar"/>
-			</fileset>
-		</delete>
-
-		<!-- framework extension fragment -->
-		<jar destfile="${export.dir}/plugins/org.eclipse.birt.api_1.0.0.jar"
-			manifest="../org.eclipse.birt.report.engine/sdk/manifest.mf.template"/>
-
-    </target>
-
-	<!-- the task only execute in headless daily build , obsolete in 3.7.0 -->
-	<target name="replaceManifest" if="buildDirectory" >
-		
-		<path id="javasrc.classpath">
-			<fileset dir="${eclipse.build.configs}/../../extras/" includes="org.eclipse.birt.build_*.jar"/>
-		</path>			
-		
-		<echo message="Create Export-Packages for manifest according to contents under: 
-			${buildDirectory}/plugins/org.eclipse.birt.report.viewer/${birt.dir.OSGI}/WEB-INF/platform/lib"/>
-		
-		<!-- Create Export-Packages for manifest according to ReportEngine/lib contents -->		
-		<java classname="org.eclipse.birt.build.ExportManifestUtils" output="../org.eclipse.birt.report.engine/sdk/mf.template">
-			<classpath refid="javasrc.classpath" />
-			<arg value="${buildDirectory}/plugins/org.eclipse.birt.report.viewer/${birt.dir.OSGI}/WEB-INF/platform/lib" />
-		</java>
-		
-		<!-- Generate manifest.mf.template to overwrite the default one -->
-        <concat destfile="${buildDirectory}/plugins/org.eclipse.birt.report.engine/sdk/manifest.mf.template">
-            <filelist dir="${buildDirectory}/plugins/org.eclipse.birt.report.engine/sdk" files="manifest.mf"/>
-            <filelist dir="${buildDirectory}/plugins/org.eclipse.birt.report.engine/sdk" files="mf.template"/>
-        </concat>
-
-	</target>
-</project>
diff --git a/viewer/org.eclipse.birt.report.viewer/build.properties b/viewer/org.eclipse.birt.report.viewer/build.properties
index ed84346f5ef..4a4c5e5d6db 100644
--- a/viewer/org.eclipse.birt.report.viewer/build.properties
+++ b/viewer/org.eclipse.birt.report.viewer/build.properties
@@ -10,23 +10,22 @@
 # * Contributors:
 # *   See git history
 # *******************************************************************************/
+source.. = src/
+output.. = bin/
 src.includes = about_files/,\
                about.html
-bin.includes = META-INF/,\
+bin.includes = .,\
+               META-INF/,\
                about.html,\
                about_files/,\
                plugin.xml,\
-               viewer.jar,\
                birt/,\
                schema/,\
                plugin.properties,\
                jetty/
 jars.compile.order = birt/WEB-INF/lib/viewservlets.jar,\
-                     viewer.jar
-source.viewer.jar = src/
-output.viewer.jar = bin/
+                     .
 source.birt/WEB-INF/lib/viewservlets.jar = birt/WEB-INF/classes
 output.birt/WEB-INF/lib/viewservlets.jar = bin/
-bin.excludes = birt/WEB-INF/classes/\
-customBuildCallbacks=customBuildCallbacks.xml
+bin.excludes = birt/WEB-INF/classes/
  
diff --git a/viewer/org.eclipse.birt.report.viewer/customBuildCallbacks.xml b/viewer/org.eclipse.birt.report.viewer/customBuildCallbacks.xml
deleted file mode 100644
index 16e1815d878..00000000000
--- a/viewer/org.eclipse.birt.report.viewer/customBuildCallbacks.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<!--
- *******************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *   See git history
- *******************************************************************************
--->
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.viewer.jar">
-
-		<property name="basedir" location="." />
-		<property name="birt.dir" value="birt" />
-		<property name="build.result.folder" value="${basedir}" />
-
-		<mkdir dir="${build.result.folder}/viewerservletssrc"/>
-		<copy todir="${build.result.folder}/viewerservletssrc" overwrite="true">
-			<fileset dir="${birt.dir}/WEB-INF/classes/" includes="**/*.java"			/>
-		</copy>
-	</target>
-	
-	<target name="pre.build.jars">
-	</target>
-	
-	<target name="setRelativePath">
-		<!--
-		<property name="workspace.core" value=".."/>
-		<property name="workspace.data" value=".."/>
-		<property name="workspace.engine" value=".."/>
-		<property name="workspace.model" value=".."/>
-		-->
-		<echo message="build.from.workspace flag: ${build.from.workspace}"/>
-        <condition property="workspace.core" value="../../core" else="..">
-        	<equals arg1="${build.from.workspace}" arg2="true" />
-        </condition>
-        <condition property="workspace.data" value="../../data" else="..">
-        	<equals arg1="${build.from.workspace}" arg2="true" />
-        </condition>
-        <condition property="workspace.engine" value="../../engine" else="..">
-        	<equals arg1="${build.from.workspace}" arg2="true" />
-        </condition>
-        <condition property="workspace.model" value="../../model" else="..">
-        	<equals arg1="${build.from.workspace}" arg2="true" />
-        </condition>
-		<echo message="workspace.data: ${workspace.data}"/>
-		<echo message="workspace.core: ${workspace.core}"/>
-		<echo message="workspace.engine: ${workspace.engine}"/>
-		<echo message="workspace.model: ${workspace.model}"/>
-	</target>
-	
-	<target name="post.viewer.jar" depends="setRelativePath">
-		<property name="basedir" location="." />
-		<property name="birt.dir" value="birt" />
-		<property name="build.result.folder" value="${basedir}" />
-		<property name="birt.temp.folder" value="${basedir}/birt.temp.folder" />
-		<property name="plugin.tomcat" value="org.eclipse.tomcat" />
-		<property name="baseLocation" value="${user.dir}" />
-		<!-- plugins used -->
-		<property name="core.dir" location="${workspace.core}/org.eclipse.birt.core" />
-		<property name="dataextraction.dir" location="${workspace.engine}/org.eclipse.birt.report.engine.dataextraction" />
-		<property name="viewer.model.dir" location="${workspace.model}/org.eclipse.birt.report.model" />
-		<property name="engine.dir" location="${workspace.engine}/org.eclipse.birt.report.engine" />
-		<property name="data.dir" location="${workspace.data}/org.eclipse.birt.data" />
-		<property name="data-adapter-api.dir" location="${workspace.data}/org.eclipse.birt.report.data.adapter" />
-
-		<echo message="basedir: ${basedir}" />
-
-		<!-- delete old files -->
-		<delete dir="${birt.temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" />
-		<mkdir dir="${birt.temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" />
-
-		<copy todir="${birt.temp.folder}/${birt.dir}/WEB-INF/classes" failonerror="true">
-			<fileset dir="${birt.dir}/WEB-INF/classes/" excludes="**/package.htm*" />
-		</copy>
-
-		
-		<javac destdir="${birt.temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" source="1.8" target="1.8" executable="${jvm16_home}/bin/javac" fork="yes" debug="true">
-			<classpath>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="javax.servlet*.jar" />
-					<include name="org.apache.jasper*.jar" />
-					<include name="org.apache.commons.logging*.jar" />
-					<include name="org.apache.commons.el*.jar"/>
-					<include name="com.ibm.icu_*.jar" />
-					<include name="javax.wsdl_1.5*.jar"/>			
-				</fileset>
-				
-				<fileset dir="${buildDirectory}/plugins">
-					<include name="org.apache.commons.codec*.jar" />
-	                <include name="org.apache.axis_*/lib/*.jar"/>
-	                <include name="javax.xml.rpc_*/lib/*.jar"/>
-	                <include name="javax.xml.soap_*/lib/*.jar"/>
-	                <include name="org.apache.commons.discovery_*/lib/*.jar"/>
-					<include name="org.mozilla.rhino_*.jar"/>
-				</fileset>
-				
-				<pathelement path="${viewer.model.dir}/@dot" />
-				<pathelement path="${viewer.model.dir}/bin" />
-				<pathelement path="${engine.dir}/@dot" />
-				<pathelement path="${engine.dir}/bin" />
-				<pathelement path="${data.dir}/@dot" />
-				<pathelement path="${data.dir}/bin" />
-				<pathelement path="${core.dir}/@dot" />
-				<pathelement path="${core.dir}/bin" />
-				<pathelement path="${dataextraction.dir}/@dot" />
-				<pathelement path="${dataextraction.dir}/bin" />
-				<pathelement path="${data-adapter-api.dir}/@dot" />
-				<pathelement path="${data-adapter-api.dir}/bin" />
-			</classpath>
-			<src path="${birt.temp.folder}/${birt.dir}/WEB-INF/classes/" />
-		</javac>
-	
-		<copy todir="${birt.temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" failonerror="true">
-			<fileset dir="${birt.temp.folder}/${birt.dir}/WEB-INF/classes/" excludes="**/*.java, **/package.htm*" />
-		</copy>
-		<mkdir dir="${build.result.folder}/${birt.dir}/WEB-INF/lib" />
-		<echo message="${build.result.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar" />
-		<jar jarfile="${build.result.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar" basedir="${birt.temp.folder}/${birt.dir}/WEB-INF/lib/viewservlets.jar.bin" />
-		
-		<delete dir="${birt.temp.folder}" />
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="pre.name">
-	</target>
-
-	<target name="pre.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do during the compilation target <name>, after the compile   -->
-	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
-	<!-- target, eg @dot                                                       -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.compile.name">
-	</target>
-	<target name="post.compile.viewer.jar">
-	</target>
-	<target name="post.compile.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.name">
-	</target>
-
-	<target name="post.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">
-	</target>
-</project>
diff --git a/viewer/org.eclipse.birt.report.viewer/pom.xml b/viewer/org.eclipse.birt.report.viewer/pom.xml
index 87de277ff4a..d2afcf7a6a1 100644
--- a/viewer/org.eclipse.birt.report.viewer/pom.xml
+++ b/viewer/org.eclipse.birt.report.viewer/pom.xml
@@ -56,6 +56,7 @@
 				<version>${antrun.version}</version>
 				<executions>
 					<execution>
+						<?m2e ignore?>
 						<id>jar-pre-compile-jsp</id>
 						<phase>process-classes</phase>
 						<configuration>
diff --git a/xtab/org.eclipse.birt.report.item.crosstab.core/build.properties b/xtab/org.eclipse.birt.report.item.crosstab.core/build.properties
index 13a5923909b..b1b8b225ea8 100644
--- a/xtab/org.eclipse.birt.report.item.crosstab.core/build.properties
+++ b/xtab/org.eclipse.birt.report.item.crosstab.core/build.properties
@@ -22,5 +22,4 @@ bin.includes = META-INF/,\
                eclipse32.png,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
-src.includes = about.html
-customBuildCallbacks=customBuildCallbacks.xml
+src.includes = about.html
\ No newline at end of file
diff --git a/xtab/org.eclipse.birt.report.item.crosstab.core/customBuildCallbacks.xml b/xtab/org.eclipse.birt.report.item.crosstab.core/customBuildCallbacks.xml
deleted file mode 100644
index 044f088e90a..00000000000
--- a/xtab/org.eclipse.birt.report.item.crosstab.core/customBuildCallbacks.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<!--
- *******************************************************************************
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
- * 
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *   See git history
- *******************************************************************************
--->
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-		<property name="basedir" location="." />
-
-		<echo message="basedir: ${basedir}"/>
-
-		<!-- make crosstabcoreapi.jar-->
-		<echo message="make crosstabcoreapi.jar"/>
-		<jar destfile="${basedir}/crosstabcoreapi.jar">
-			<fileset dir="@dot">
-				<include name="org/eclipse/birt/report/item/crosstab/core/*.class" />
-				<include name="org/eclipse/birt/report/item/crosstab/core/de/**/*.class" />
-				<include name="org/eclipse/birt/report/item/crosstab/core/i18n/*.class" />
-				<include name="org/eclipse/birt/report/item/crosstab/core/i18n/*.properties" />
-				<include name="org/eclipse/birt/report/item/crosstab/core/script/*.class" />
-				<include name="org/eclipse/birt/report/item/crosstab/core/util/*.class" />
-			</fileset>
-		</jar>
-
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="pre.name">
-	</target>
-
-	<target name="pre.@dot">
-		
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do during the compilation target <name>, after the compile   -->
-	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
-	<!-- target, eg @dot                                                       -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.compile.name">
-	</target>
-
-	<target name="post.compile.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.name">
-	</target>
-
-	<target name="post.@dot">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">
-	</target>
-</project>