switch to use org.mozilla.javascript in 2.6.1

eclipse-birt · Jul 13, 2010 · a74af53 · a74af53
1 parent bdac27e
commit a74af53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 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", 
-		"org.mozilla.javascript_.*.jar",
+		"js.jar",
 		"modelapi.jar", 
 		"crosstabcoreapi.jar",
 		"dataextraction.jar",
@@ -49,7 +49,7 @@ public class ExportManifestUtils
 		false,//"engineapi.jar", 
 		false,//"emitterconfig.jar",
 		false,//"flute.jar", 
-		false,//"org.mozilla.script_.*.jar",
+		false,//"js.jar",
 		false,//"modelapi.jar", 
 		false,//"crosstabcoreapi.jar",
 		false,//"dataextraction.jar",

diff --git a/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml b/viewer/org.eclipse.birt.report.viewer/WebViewerPackager.xml
@@ -606,14 +606,19 @@
 			<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.mozilla.javascript_*.jar"/>
 				<include name="org.apache.commons.codec_*.jar"/>
 			</fileset>
 		</copy>