diff --git a/bin/idea.sh b/bin/idea.sh
index eedd138fdde..ca674e2925d 100644
--- a/bin/idea.sh
+++ b/bin/idea.sh
@@ -197,13 +197,15 @@ CP=$ANT_HOME/lib/ant.jar
 rm -rf $CLASSES; mkdir $CLASSES
 
 if [ "x$CYGPATH" = "x" ] ; then ## CYGPATH may be set in env.cfg
-  JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/JdkIdeaAntLogger.java
+  JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
+  JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
   JAVAC_CLASSES=$CLASSES
   JAVAC_CP=$CP
 else
-  JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/JdkIdeaAntLogger.java`
+  JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
+  JAVAC_SOURCE_PATH=`cygpath -am $IDEA_OUTPUT/src`
   JAVAC_CLASSES=`cygpath -am $CLASSES`
   JAVAC_CP=`cygpath -am $CP`
 fi
 
-$BOOT_JDK/bin/javac -d $JAVAC_CLASSES -cp $JAVAC_CP $JAVAC_SOURCE_FILE
+$BOOT_JDK/bin/javac -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE
diff --git a/make/idea/build.xml b/make/idea/build.xml
index 611ba851447..0292f0f5d35 100644
--- a/make/idea/build.xml
+++ b/make/idea/build.xml
@@ -1,10 +1,9 @@
 <!-- importing.xml -->
 <project name="jdk">
 
-    <script language="javascript" classpath="${idea.dir}/classes">
-        var JdkLogger = Java.type("idea.JdkIdeaAntLogger");
-        new JdkLogger(project)
-    </script>
+    <taskdef name="wrapLogger" classname="idea.IdeaLoggerWrapper" classpath="${idea.dir}/classes"/>
+
+    <wrapLogger/>
 
     <macrodef name="call-make">
         <attribute name="dir"/>
diff --git a/make/idea/template/src/idea/IdeaLoggerWrapper.java b/make/idea/template/src/idea/IdeaLoggerWrapper.java
new file mode 100644
index 00000000000..0071669815a
--- /dev/null
+++ b/make/idea/template/src/idea/IdeaLoggerWrapper.java
@@ -0,0 +1,13 @@
+package idea;
+
+import org.apache.tools.ant.Task;
+
+/**
+ * This class implements a custom Ant task which replaces the standard Intellij IDEA Ant logger
+ * with a custom one which generates tighter output.
+ */
+public class IdeaLoggerWrapper extends Task {
+    public void execute() {
+        new JdkIdeaAntLogger(getProject());
+    }
+}
diff --git a/make/langtools/build.xml b/make/langtools/build.xml
index 8ae4efaeeff..84db47e0edb 100644
--- a/make/langtools/build.xml
+++ b/make/langtools/build.xml
@@ -88,21 +88,11 @@
     <pathconvert pathsep="," property="src.module.dirs" refid="src.module.dirset"/>
 
     <pathconvert property="xpatch.rest" pathsep=" --patch-module=" refid="src.module.dirset">
-        <scriptmapper language="javascript">
-            fs = project.getProperty("file.separator");
-            path = project.getProperty("build.modules");
-            mod = source.substr(source.lastIndexOf(fs)+1);
-            self.addMappedName(mod + "=\"" + path + fs + mod + "\"");
-        </scriptmapper>
+        <regexpmapper from="^.*(/|\\)([^/\\]*)$" to='\2="${build.modules}\1\2"' />
     </pathconvert>
 
     <pathconvert property="xpatch.noquotes.rest" pathsep=" --patch-module=" refid="src.module.dirset">
-        <scriptmapper language="javascript">
-            fs = project.getProperty("file.separator");
-            path = project.getProperty("build.modules");
-            mod = source.substr(source.lastIndexOf(fs)+1);
-            self.addMappedName(mod + "=" + path + fs + mod);
-        </scriptmapper>
+        <regexpmapper from="^([^/\\]*)(/|\\).*" to="\1=${build.modules}\2\1" />
     </pathconvert>
 
     <property name="xpatch.cmd" value="--patch-module=${xpatch.rest}"/>
@@ -212,14 +202,7 @@
 
     <target name="build-all-classes" depends="generate-sources">
         <pathconvert property="xpatch.src.rest" pathsep=" --patch-module=" refid="src.module.dirset">
-            <scriptmapper language="javascript">
-                fs = project.getProperty("file.separator");
-                path_src = project.getProperty("src.dir");
-                path_sep = project.getProperty("path.separator");
-                path_gensrc = project.getProperty("build.gensrc");
-                mod = source.substr(source.lastIndexOf(fs)+1);
-                self.addMappedName(mod + "=" + path_src + fs + mod + path_sep + path_gensrc + fs + mod);
-            </scriptmapper>
+            <regexpmapper from="^.*(/|\\)([^/\\]*)$" to="\2=${src.dir}\1\2/share/classes${path.separator}${build.gensrc}\1\2" />
         </pathconvert>
         <property name="xpatch.src.cmd" value="--patch-module=${xpatch.src.rest}"/>
         <pathconvert pathsep="," property="gensrc.module.dirs">
diff --git a/make/langtools/intellij/build.xml b/make/langtools/intellij/build.xml
index f08f9d9e5fa..8f08492afc0 100644
--- a/make/langtools/intellij/build.xml
+++ b/make/langtools/intellij/build.xml
@@ -1,10 +1,9 @@
 <!-- importing.xml -->
 <project name="langtools" basedir = "../../..">
 
-    <script language="javascript" classpath=".idea/classes">
-        var LangtoolsLogger = Java.type("idea.LangtoolsIdeaAntLogger");
-        new LangtoolsLogger(project)
-    </script>
+    <taskdef name="wrapLogger" classname="idea.IdeaLoggerWrapper" classpath=".idea/classes"/>
+
+    <wrapLogger/>
 
     <import file="../build.xml"/>
 
diff --git a/make/langtools/intellij/template/src/idea/IdeaLoggerWrapper.java b/make/langtools/intellij/template/src/idea/IdeaLoggerWrapper.java
new file mode 100644
index 00000000000..c5a5015be20
--- /dev/null
+++ b/make/langtools/intellij/template/src/idea/IdeaLoggerWrapper.java
@@ -0,0 +1,13 @@
+package idea;
+
+import org.apache.tools.ant.Task;
+
+/**
+ * This class implements a custom Ant task which replaces the standard Intellij IDEA Ant logger
+ * with a custom one which generates tighter output.
+ */
+public class IdeaLoggerWrapper extends Task {
+    public void execute() {
+        new LangtoolsIdeaAntLogger(getProject());
+    }
+}