--- old/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/Log.java	2014-04-29 11:30:56.000000000 -0600
+++ /dev/null	2014-04-29 11:30:56.000000000 -0600
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.javafx.tools.packager;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-public class Log {
-    public static class Logger {
-        private boolean verbose = false;
-
-        public Logger(boolean v) {
-            verbose = v;
-        }
-
-        public void info(String msg) {
-            System.out.println(msg);
-        }
-
-        public void verbose(Throwable t) {
-            if (Log.debug || verbose) {
-                t.printStackTrace(System.out);
-            }
-        }
-
-        public void verbose(String msg) {
-            if (Log.debug || verbose) {
-                System.out.println(msg);
-            }
-        }
-
-        public void debug(String msg) {
-            if (Log.debug) {
-                System.out.println(msg);
-            }
-        }
-    }
-
-    private static Logger delegate = null;
-    private static boolean debug =
-            "true".equals(System.getenv("JAVAFX_ANT_DEBUG"));
-
-    public static void setLogger(Logger l) {
-        delegate = l;
-        if (l == null) {
-            delegate = new Logger(false);
-        }
-    }
-
-
-    public static void info(String msg) {
-        if (delegate != null) {
-           delegate.info(msg);
-        }
-    }
-
-    public static void verbose(String msg) {
-        if (delegate != null) {
-           delegate.verbose(msg);
-        }
-    }
-
-    public static void verbose(Throwable t) {
-        if (delegate != null) {
-           delegate.verbose(t);
-        }
-    }
-
-    public static void debug(String msg) {
-        if (delegate != null) {
-           delegate.debug(msg);
-        }
-    }
-
-    public static void debug(RuntimeException re) {
-        debug((Throwable) re);
-    }
-
-    public static void debug(Throwable t) {
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-            try (PrintStream ps = new PrintStream(baos)) {
-                t.printStackTrace(ps);
-            }
-            debug(baos.toString());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static boolean isDebug() {
-        return debug;
-    }
-
-    public static void setDebug(boolean debug) {
-        Log.debug = debug;
-    }
-}
--- /dev/null	2014-04-29 11:30:56.000000000 -0600
+++ new/modules/fxpackager/src/main/java/com/oracle/tools/packager/Log.java	2014-04-29 11:30:55.000000000 -0600
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.tools.packager;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+
+public class Log {
+    public static class Logger {
+        private boolean verbose = false;
+
+        public Logger(boolean v) {
+            verbose = v;
+        }
+
+        public void info(String msg) {
+            System.out.println(msg);
+        }
+
+        public void verbose(Throwable t) {
+            if (Log.debug || verbose) {
+                t.printStackTrace(System.out);
+            }
+        }
+
+        public void verbose(String msg) {
+            if (Log.debug || verbose) {
+                System.out.println(msg);
+            }
+        }
+
+        public void debug(String msg) {
+            if (Log.debug) {
+                System.out.println(msg);
+            }
+        }
+    }
+
+    private static Logger delegate = null;
+    private static boolean debug =
+            "true".equals(System.getenv("JAVAFX_ANT_DEBUG"));
+
+    public static void setLogger(Logger l) {
+        delegate = l;
+        if (l == null) {
+            delegate = new Logger(false);
+        }
+    }
+
+
+    public static void info(String msg) {
+        if (delegate != null) {
+           delegate.info(msg);
+        }
+    }
+
+    public static void verbose(String msg) {
+        if (delegate != null) {
+           delegate.verbose(msg);
+        }
+    }
+
+    public static void verbose(Throwable t) {
+        if (delegate != null) {
+           delegate.verbose(t);
+        }
+    }
+
+    public static void debug(String msg) {
+        if (delegate != null) {
+           delegate.debug(msg);
+        }
+    }
+
+    public static void debug(RuntimeException re) {
+        debug((Throwable) re);
+    }
+
+    public static void debug(Throwable t) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            try (PrintStream ps = new PrintStream(baos)) {
+                t.printStackTrace(ps);
+            }
+            debug(baos.toString());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static boolean isDebug() {
+        return debug;
+    }
+
+    public static void setDebug(boolean debug) {
+        Log.debug = debug;
+    }
+}