Author: jlboudart
Date: Wed Jan 28 06:22:21 2015
New Revision: 1655225
URL: http://svn.apache.org/r1655225
Log:
Make xooki work on java8+ based jvm.
Modified:
ant/site/xooki/antlib.xml
ant/site/xooki/xooki.js
Modified: ant/site/xooki/antlib.xml
URL:
http://svn.apache.org/viewvc/ant/site/xooki/antlib.xml?rev=1655225&r1=1655224&r2=1655225&view=diff
==============================================================================
--- ant/site/xooki/antlib.xml (original)
+++ ant/site/xooki/antlib.xml Wed Jan 28 06:22:21 2015
@@ -24,6 +24,11 @@
<attribute name="checkUpToDate"/>
<attribute name="printerFriendly"/>
<![CDATA[
+ try {
+ load("nashorn:mozilla_compat.js");
+ } catch (e) {
+ // ignore the exception - perhaps we are running on Rhino!
+ }
importClass(java.io.File);
var xookidir = attributes.get("xookidir");
@@ -126,4 +131,4 @@
}
]]>
</scriptdef>
-</antlib>
\ No newline at end of file
+</antlib>
Modified: ant/site/xooki/xooki.js
URL:
http://svn.apache.org/viewvc/ant/site/xooki/xooki.js?rev=1655225&r1=1655224&r2=1655225&view=diff
==============================================================================
--- ant/site/xooki/xooki.js (original)
+++ ant/site/xooki/xooki.js Wed Jan 28 06:22:21 2015
@@ -1152,6 +1152,11 @@ xooki.init = function() {
};
if (batchMode) {
+ try {
+ load("nashorn:mozilla_compat.js");
+ } catch (e) {
+ // ignore the exception - perhaps we are running on Rhino!
+ }
importPackage(java.io);
xooki.io.loadFile = function( url, warnOnError ) {
