Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4C997200CB2 for ; Sun, 25 Jun 2017 18:13:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4AD82160BE0; Sun, 25 Jun 2017 16:13:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 910E5160BD8 for ; Sun, 25 Jun 2017 18:13:01 +0200 (CEST) Received: (qmail 97950 invoked by uid 500); 25 Jun 2017 16:13:00 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 97941 invoked by uid 99); 25 Jun 2017 16:13:00 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Jun 2017 16:13:00 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 1B23A3A002A for ; Sun, 25 Jun 2017 16:13:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1799826 - /ant/site/xooki/antlib.xml Date: Sun, 25 Jun 2017 16:13:00 -0000 To: notifications@ant.apache.org From: hibou@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170625161300.1B23A3A002A@svn01-us-west.apache.org> archived-at: Sun, 25 Jun 2017 16:13:02 -0000 Author: hibou Date: Sun Jun 25 16:12:59 2017 New Revision: 1799826 URL: http://svn.apache.org/viewvc?rev=1799826&view=rev Log: make xooki run on modern jvm Modified: ant/site/xooki/antlib.xml Modified: ant/site/xooki/antlib.xml URL: http://svn.apache.org/viewvc/ant/site/xooki/antlib.xml?rev=1799826&r1=1799825&r2=1799826&view=diff ============================================================================== --- ant/site/xooki/antlib.xml (original) +++ ant/site/xooki/antlib.xml Sun Jun 25 16:12:59 2017 @@ -29,7 +29,6 @@ } catch (e) { // ignore the exception - perhaps we are running on Rhino! } - importClass(java.io.File); var xookidir = attributes.get("xookidir"); if (xookidir == null) { @@ -50,7 +49,7 @@ for (i = 0; i < srcFiles.length; i++) { // get the values via Java API - var file = new File(fs.getDir(project), srcFiles[i]); + var file = new java.io.File(fs.getDir(project), srcFiles[i]); var basedir = file.getParent(); var filename = file.getName(); @@ -61,7 +60,7 @@ upToDate = project.createTask("uptodate"); upToDate.setProperty(p); upToDate.setSrcfile(file); - upToDate.setTargetFile(new File(attributes.get("destdir") + "/" + filepath + "/" + filename)); + upToDate.setTargetFile(new java.io.File(attributes.get("destdir") + "/" + filepath + "/" + filename)); upToDate.perform(); if (project.getProperty(p) != null) { self.log(srcFiles[i]+" is up to date", 3); @@ -70,7 +69,7 @@ } exec = project.createTask("exec"); - exec.setDir(new File(basedir)); + exec.setDir(new java.io.File(basedir)); exec.setExecutable("jrunscript"); exec.setTaskName("generate"); exec.createArg().setValue(xookidir + "/xooki.js"); @@ -90,10 +89,9 @@