From 20da5c48eacef6b9d7280d568b7846dd2ad174f9 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Thu, 5 Jul 2012 11:43:35 +0100
Subject: [PATCH] got the mvn k2js plugin working again & re-enabled the js
 building in the mvn build (apart from running the junit JS tests as some of
 them fail)

---
 libraries/pom.xml                                    | 12 ------------
 .../org/jetbrains/kotlin/maven/K2JSCompilerMojo.java |  3 ++-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/libraries/pom.xml b/libraries/pom.xml
index e6d6d0e2fa5..8f5f2415d37 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -52,13 +52,7 @@
         <module>tools/runtime</module>
         <module>tools/kotlin-maven-plugin</module>
         <module>tools/kotlin-js-library</module>
-<!--
-        TODO: temporary fix until this bug fixed:
-        java.lang.IllegalStateException: null at (5,10) in /stdlib/JUMaps.kt.jet
-
         <module>tools/kotlin-js-tests</module>
--->
-
 <!--
         TODO temporary disabled until KT-2314 fixed
 
@@ -77,14 +71,8 @@
         <module>docs/website</module>
 
         <module>examples/kotlin-java-example</module>
-
-        <!--
-                TODO: temporary fix until this bug fixed:
-                java.lang.IllegalStateException: null at (5,10) in /stdlib/JUMaps.kt.jet
-
         <module>examples/js-example</module>
         <module>examples/browser-example</module>
-        -->
     </modules>
 
     <dependencies>
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
index 594205c4cd2..5d63d556cfb 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
@@ -29,6 +29,7 @@ import org.jetbrains.k2js.config.MetaInfServices;
 
 import java.io.*;
 import java.nio.charset.Charset;
+import java.util.Arrays;
 
 /**
  * Converts Kotlin to JavaScript code
@@ -165,8 +166,8 @@ public class K2JSCompilerMojo extends KotlinCompileMojo {
             if (sources.size() > 0) {
                 k2jsArgs.sourceFiles = sources.toArray(new String[sources.size()]);
             }
+            getLog().info("Compiling Kotlin src from " + Arrays.asList(k2jsArgs.sourceFiles) + " to JavaScript at: " + outputFile);
         }
-        getLog().info("Compiling Kotlin src from " + arguments.getSrc() + " to JavaScript at: " + outputFile);
     }
 
     @Override