Patches from #343021: "Rhino E4X does not correctly build from source with Ant"

js/rhino/.cvsignore

@@ -1,2 +1,4 @@
 build
-lib
+lib
+build.local.properties
+downloaded

js/rhino/build.properties

@@ -55,6 +55,6 @@ source-level: 1.3
 jar-compression: true
 
 # optional external packages
-lib: lib
-xbean.jar: ${lib}/xbean.jar
-
+xmlbeans: .
+xbean.jar: ${xmlbeans}/lib/xbean.jar
+jsr173.jar: ${xmlbeans}/lib/jsr173_1.0_api.jar

js/rhino/build.xml

@@ -8,6 +8,8 @@ Requires Ant version 1.2 or later
 <project name="Rhino" default="help" basedir=".">
 
   <target name="properties">
+    <!-- Allow user to override default settings from build.properties -->
+    <property file="build.local.properties" />
     <tstamp>
       <!-- Specify date part of Context#getImplementationVersion() -->
       <format property="implementation.date" pattern="yyyy MM dd"/>