Provide BIRT runtime package with OSGi

4 files changed, 537 insertions, 2 deletions

diff --git a/build/org.eclipse.birt.releng.birtbuilder/buildAll.xml b/build/org.eclipse.birt.releng.birtbuilder/buildAll.xml
index ef551cf..da1a3ba 100644
--- a/build/org.eclipse.birt.releng.birtbuilder/buildAll.xml
+++ b/build/org.eclipse.birt.releng.birtbuilder/buildAll.xml
@@ -122,6 +122,10 @@
 			<equals arg1="${HQ.BIRT.skip}" arg2="true" />
 		</condition>
 		
+		<condition property="build.runtimeOSGI" value="true">
+			<equals arg1="${HQ.BIRT.skip}" arg2="true" />
+		</condition>
+
 		<!--compiler args-->
 		<property name="compilerArg" value="-enableJavadoc -encoding utf-8 -warn:-discouraged,forbidden" />
 		<property name="javacSource" value="1.5" />
@@ -1182,6 +1186,7 @@
             <bundle name="org.eclipse.birt.report.engine.emitter.odp"/>
             <bundle name="org.eclipse.birt.report.engine.emitter.ods"/>
             <bundle name="org.eclipse.birt.report.engine.emitter.odt"/>
+			<bundle name="org.eclipse.birt.report.engine.odf"/>
 	    	<bundle name="org.eclipse.birt.report.engine.fonts"/>
 	    	<bundle name="org.eclipse.birt.report.engine.script.javascript"/>
 	    	<bundle name="org.eclipse.birt.report.item.crosstab.core"/>
diff --git a/build/org.eclipse.birt.releng.birtbuilder/eclipse/buildConfigs/birt/tools/BIRTDownloadSetup.xml b/build/org.eclipse.birt.releng.birtbuilder/eclipse/buildConfigs/birt/tools/BIRTDownloadSetup.xml
index 14de6d2..86457eb 100644
--- a/build/org.eclipse.birt.releng.birtbuilder/eclipse/buildConfigs/birt/tools/BIRTDownloadSetup.xml
+++ b/build/org.eclipse.birt.releng.birtbuilder/eclipse/buildConfigs/birt/tools/BIRTDownloadSetup.xml
@@ -71,6 +71,7 @@
 	<property name="allinone.hq.zip.name" value="birt-report-designer-all-in-one-HQ-${package.version}.zip" />
 	<property name="allinone.linux.zip.name" value="birt-report-designer-all-in-one-${package.version}-linux-gtk.tar" />
 	<property name="runtime.zip.name" value="birt-runtime-${package.version}.zip" />
+	<property name="runtime.osgi.zip.name" value="birt-runtime-osgi-${package.version}.zip" />
 	<property name="wtp.runtime.zip.name" value="birt.zip" />
 	<property name="charts.zip.name" value="birt-charts-${package.version}.zip" />
 	<property name="iportal.lib.name" value="iportal-library.zip" />
@@ -88,6 +89,7 @@
 	<property name="iportal.tmp" value="${OutputDir}/iportal_tmp" />
 	
 	<property name="birt.runtime.dir.prefix" value="birt-runtime-${package.version}" />
+	<property name="birt.runtime.osgi.dir.prefix" value="birt-runtime-osgi-${package.version}" />
 	<property name="chart.sdk.dir.prefix" value="birt-charts-${package.version}" />
 	<property name="birt.rcp.dir.prefix" value="birt-rcp-report-designer-${package.version}" />
 		
@@ -229,6 +231,8 @@
 		<antcall target="createBirtFramework" />
 
 		<antcall target="createBirtRuntime" />
+
+		<antcall target="createBirtRuntime_OSGI" />
 			
 		<antcall target="createSamplePlugin" />
 		
@@ -654,6 +658,82 @@
 		<delete dir="${runtime.tmp}" failonerror="false"/>
 
 	</target>
+
+	<target name="createBirtRuntime_OSGI" depends="createWAR_OSGI" if="build.runtimeOSGI">
+        <!-- Create birt-runtime/ReportEngine -->
+		<copy todir="${runtime.tmp}/ReportEngine" flatten="false">
+			<fileset dir="${deposit}/birt_web_OSGI/org.eclipse.birt.report.viewer/birt_web_OSGI/WEB-INF/platform">
+				<patternset refid="exclude.jars" />
+				<exclude name="**/*.nl1_*/**"/>
+				<exclude name="**/*.nl/**" />
+				<exclude name="**/*.nl1_*.jar"/>
+				<exclude name="**/org.junit*/**"/>
+			</fileset>
+		</copy>
+		<copy todir="${runtime.tmp}/ReportEngine/samples">
+			<fileset dir="${template.dir}/engine.runtime.samples">
+				<include name="*.*" />
+			</fileset>
+		</copy>
+		<copy todir="${runtime.tmp}/ReportEngine">
+			<fileset dir="${template.dir}/engine.runtime.bin">
+				<include name="*.*" />
+			</fileset>
+		</copy>
+
+		<!-- Create birt-runtime/WebViewerExample-->
+		<copy todir="${runtime.tmp}/WebViewerExample">
+			<fileset dir="${deposit}/birt_web_OSGI/org.eclipse.birt.report.viewer/birt_web_OSGI">
+				<patternset refid="exclude.jars" />
+			    <exclude name="plugins/**"/>
+				<exclude name="images/**" />
+				<exclude name="pages/**" />
+				<exclude name="styles/**" />
+				<exclude name="**/*.nl1_*/**"/>
+				<exclude name="**/*.nl/**" />
+				<exclude name="**/*.nl1_*.jar"/>
+				<exclude name="**/org.junit*/**"/>
+			</fileset>
+		</copy>
+
+		<!--Correct web.xml in birt sample, remove *_jsp.class from the viewservlets.jar-->
+		<move file="${runtime.tmp}/WebViewerExample/WEB-INF/web_deploy.xml" tofile="${runtime.tmp}/WebViewerExample/WEB-INF/web.xml" />
+		<unjar src="${runtime.tmp}/WebViewerExample/WEB-INF/lib/viewservlets.jar" dest="${runtime.tmp}/WebViewerExample/WEB-INF/lib/viewservlets" />
+		<delete file="${runtime.tmp}/WebViewerExample/WEB-INF/lib/viewservlets.jar" />
+		<jar destfile="${runtime.tmp}/WebViewerExample/WEB-INF/lib/viewservlets.jar" basedir="${runtime.tmp}/WebViewerExample/WEB-INF/lib/viewservlets" excludes="**/*_jsp.class" />
+		<delete dir="${runtime.tmp}/WebViewerExample/WEB-INF/lib/viewservlets" />
+
+		<copy todir="${runtime.tmp}">
+			<fileset dir="${template.dir}/birt.runtime.files">
+				<include name="*.*" />
+			</fileset>
+		</copy>
+
+		<delete dir="${runtime.tmp}/WebViewerExample/ajax" />
+		<delete includeEmptyDirs="true" failonerror="false" >
+			<fileset dir="${runtime.tmp}/WebViewerExample/WEB-INF/platform" includes="lib/**" />
+		</delete>
+
+		<!-- copy extra chartengine, emf has been copied by viewer plugin -->
+		<copy todir="${runtime.tmp}/WebViewerExample/WEB-INF/lib">
+			<fileset dir="${deposit}/eclipse/plugins" />
+			<mapper type="regexp"  from="org.eclipse.birt.chart.engine_.*.jar" to="chartengineapi.jar"/>
+		</copy>
+
+		<zip destfile="${OutputDir}/${runtime.osgi.zip.name}">
+			<zipfileset dir="${runtime.tmp}" prefix="${birt.runtime.osgi.dir.prefix}" filemode="755">
+			</zipfileset>
+			<zipfileset dir="${template.dir}/legal" prefix="${birt.runtime.osgi.dir.prefix}">
+				<include name="**/*" />
+				<exclude name="eclipse.ini" />
+			</zipfileset>
+			<zipfileset dir="${template.dir}/birt-runtime-about" prefix="${birt.runtime.osgi.dir.prefix}">
+				<include name="**/*"/>
+			</zipfileset>
+		</zip>
+		<delete dir="${runtime.tmp}" />
+
+	</target>
 	
 	<target name="createBirtRuntimeNonOSGi">
 		
@@ -776,6 +856,40 @@
 	    <delete dir="${war.tmp}"/>
 	</target>
 	
+	<target name="createWAR_OSGI">
+	   <mkdir dir="${runtime.tmp}" />
+	   <mkdir dir="${war.tmp}/birt" />
+       <copy todir="${war.tmp}/birt">
+		  <fileset dir="${deposit}/birt_web_OSGI/org.eclipse.birt.report.viewer/birt_web_OSGI" >
+		<exclude name="plugins/**" />
+		<patternset refid="exclude.jars" />
+			<exclude name="**/*.nl1_*/**"/>
+			<exclude name="**/*.nl/**" />
+			<exclude name="**/*.nl1_*.jar"/>
+		  </fileset>
+	</copy>
+        <delete file="${war.tmp}/birt/WEB-INF/web.xml"/>
+		<move file="${war.tmp}/birt/WEB-INF/web_deploy.xml" tofile="${war.tmp}/birt/WEB-INF/web.xml"/>
+
+	    <!--remove *_jsp.class from the viewservlets.jar in WAR-->
+	    <unjar src="${war.tmp}/birt/WEB-INF/lib/viewservlets.jar" dest="${war.tmp}/birt/WEB-INF/lib/viewservlets" />
+	    <delete file="${war.tmp}/birt/WEB-INF/lib/viewservlets.jar" />
+	    <jar destfile="${war.tmp}/birt/WEB-INF/lib/viewservlets.jar" basedir="${war.tmp}/birt/WEB-INF/lib/viewservlets" excludes="**/*_jsp.class" />
+	    <delete dir="${war.tmp}/birt/WEB-INF/lib/viewservlets" />
+	    <delete dir="${war.tmp}/birt/ajax" failonerror="false" />
+	    <delete includeEmptyDirs="true" failonerror="false" >
+		<fileset dir="${war.tmp}/birt/WEB-INF/platform" includes="lib/**" />
+	    </delete>
+	    <zip destfile="${runtime.tmp}/birt.war">
+	        <zipfileset dir="${war.tmp}/birt" >
+			<include name="**/*" />
+			<exclude name="plugin/**" />
+			<patternset refid="exclude.jars" />
+		</zipfileset>
+	    </zip>
+	    <delete dir="${war.tmp}"/>
+	</target>
+
 	<target name="createNLGroup1" >
 		<!-- package NL for Report Designer Full Eclipse Install -->
 		<zip destfile="${OutputDir}/${nl.group1.zip.name.allinone}">
diff --git a/build/org.eclipse.birt.releng.birtbuilder/eclipse/helper.xml b/build/org.eclipse.birt.releng.birtbuilder/eclipse/helper.xml
index b57db8f..316eac7 100644
--- a/build/org.eclipse.birt.releng.birtbuilder/eclipse/helper.xml
+++ b/build/org.eclipse.birt.releng.birtbuilder/eclipse/helper.xml
@@ -996,6 +996,15 @@
 	
 	<!-- 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"/>
@@ -1004,6 +1013,26 @@
 		<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">
diff --git a/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml b/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml
index 13e2f6b..2a8cb9c 100644
--- a/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml
+++ b/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml
@@ -86,6 +86,11 @@
 	<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}"/>
@@ -94,6 +99,7 @@
 	<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-->
@@ -112,10 +118,18 @@
 		<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">
@@ -135,6 +149,24 @@
 		</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">
@@ -160,6 +192,16 @@
 		</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
@@ -263,6 +305,43 @@
 	
 </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">
@@ -299,11 +378,64 @@
 	<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.5" 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.javascript*.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">
@@ -400,6 +532,261 @@
 
 	</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.eclipse.core.runtime.compatibility.registry_*/**" />
+			<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.compatibility_*.jar" />
+			<include name="org.eclipse.core.runtime.compatibility.auth_*.jar"/>
+			<include name="org.eclipse.core.runtime.compatibility.registry_*.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" />
+			<!-- 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"/>
+		</fileset>
+		</copy>
+
+		<copy todir="${export.dir}/plugins">
+		<fileset dir="${integrate.dir}/plugins">
+			<!-- 3rd party bundles -->
+			<include name="org.apache.derby.core_*/**" />
+			<include name="org.w3c.sac_*/**" />
+			<include name="org.mozilla.javascript*/**" />
+			<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.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.jdbc.hive_*.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.html.config_*.jar" />
+			<include name="org.eclipse.birt.report.engine.emitter.pdf.config_*.jar" />
+			<include name="org.eclipse.birt.report.engine.emitter.postscript.config_*.jar" />
+			<include name="org.eclipse.birt.report.engine.emitter.wpml.config_*.jar" />
+			<include name="org.eclipse.birt.report.engine.emitter.excel.config_*.jar"/>
+			<include name="org.eclipse.birt.report.engine.emitter.ppt.config_*.jar"/>
+			<include name="org.eclipse.birt.report.engine.emitter.odp.config_*.jar"/>
+			<include name="org.eclipse.birt.report.engine.emitter.ods.config_*.jar"/>
+			<include name="org.eclipse.birt.report.engine.emitter.odt.config_*.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" />
+		</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>
+		</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.javascript_.*.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" >
 		
@@ -408,12 +795,12 @@
 		</path>			
 		
 		<echo message="Create Export-Packages for manifest according to contents under: 
-			${buildDirectory}/plugins/org.eclipse.birt.report.viewer/birt_web/WEB-INF/platform/lib"/>
+			${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_web/WEB-INF/platform/lib" />
+			<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 -->