switch to use org.mozilla.javascript in 2.6.1

eclipse-birt · Jul 9, 2010 · 1ca40eb · 1ca40eb
1 parent 282389a
commit 1ca40eb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/build/org.eclipse.birt.build/src/org/eclipse/birt/build/ExportManifestUtils.java b/build/org.eclipse.birt.build/src/org/eclipse/birt/build/ExportManifestUtils.java
@@ -21,7 +21,7 @@ public class ExportManifestUtils
 		"engineapi.jar", 
 		"emitterconfig.jar",
 		"flute.jar", 
-		"js.jar",
+		"org.mozilla.script_.*.jar",
 		"modelapi.jar", 
 		"crosstabcoreapi.jar",
 		"dataextraction.jar",
@@ -49,7 +49,7 @@ public class ExportManifestUtils
 		false,//"engineapi.jar", 
 		false,//"emitterconfig.jar",
 		false,//"flute.jar", 
-		false,//"js.jar",
+		false,//"org.mozilla.script_.*.jar",
 		false,//"modelapi.jar", 
 		false,//"crosstabcoreapi.jar",
 		false,//"dataextraction.jar",

diff --git a/chart/org.eclipse.birt.chart.viewer/BuildChartWebViewer.xml b/chart/org.eclipse.birt.chart.viewer/BuildChartWebViewer.xml
@@ -112,7 +112,7 @@
 				<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_*/lib/*.jar" />
+				<include name="org.mozilla.script_*.jar" />
 				<!-- batik.pdf has been moved to Orbit -->
 				<!--
 				<include name="org.apache.batik.pdf_*/lib/*.jar" />

diff --git a/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Chart viewer
 Bundle-SymbolicName: org.eclipse.birt.chart.viewer;singleton:=true
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-ClassPath: .,
  WebContent/WEB-INF/lib/
 Bundle-Vendor: Eclipse.org

diff --git a/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml b/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml
@@ -91,7 +91,6 @@
 	<!-- Component locations -->
 	<property name="viewer.model.dir" location="../org.eclipse.birt.report.model" />
 	<property name="core.dir" location="../org.eclipse.birt.core" />
-	<property name="js.dir" location="../org.mozilla.rhino" />
 	<property name="data.dir" location="../org.eclipse.birt.data" />
 	<property name="oda.dir" location="../org.eclipse.birt.data.oda" />
 	<property name="oda-adapter.dir" location="../org.eclipse.birt.data.oda.adapter.dtp" />
@@ -304,14 +303,14 @@
 				<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.script*.jar"/>
 			</fileset>
 			<fileset dir="${build.result.folder}/${birt.dir}/WEB-INF/lib">
 				<include name="*.jar" />
 			</fileset>
 			<fileset dir="${data-adapter-api.dir}">
 				<include name="*.jar" />
 			</fileset>
-			<pathelement path="${js.dir}/lib/js.jar" />
 		</classpath>
 		<src path="${birt.dir}/WEB-INF/classes/" />
 	</javac>
@@ -496,7 +495,7 @@
 			<!-- 3rd party bundles -->
 			<include name="org.apache.derby.core_*/**" />
 			<include name="org.w3c.sac_*/**" />
-			<include name="org.mozilla.rhino_*/**" />
+			<include name="org.mozilla.script*/**" />
 			<include name="com.lowagie.text_*/**" />
 			<!-- birt bundles -->
 			<include name="org.eclipse.birt.chart.device.extension_*.jar" />
@@ -591,12 +590,6 @@
         <fileset dir="../org.eclipse.birt.chart.examples.core">
             <include name="chartexamplescoreapi.jar" />
         </fileset>
-		<fileset dir="../org.mozilla.rhino/lib">
-			<include name="*.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" />
@@ -617,6 +610,7 @@
 			</fileset>
 			<fileset dir="${buildDirectory}/plugins">
 				<include name="org.w3c.css.sac_*.jar"/>
+				<include name="org.mozilla.script_*.jar"/>
 				<include name="org.apache.commons.codec_*.jar"/>
 			</fileset>
 		</copy>