--- old/modules/javafx.jmx/src/test/java/com/oracle/javafx/jmx/TestUtils.java	2016-11-02 13:32:15.243658731 -0400
+++ /dev/null	2016-10-31 09:37:02.128008072 -0400
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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.javafx.jmx;
-
-import com.oracle.javafx.jmx.json.JSONDocument;
-import com.oracle.javafx.jmx.json.JSONFactory;
-
-import java.io.StringReader;
-
-public class TestUtils {
-
-    static JSONDocument getJSONDocument(String source) {
-        return JSONFactory.instance().makeReader(new StringReader(source)).build();
-    }
-
-    static int[] getWindowIDs(JSONDocument jwindows) {
-        final int windowsCount = jwindows.array().size();
-        int res[] = new int[windowsCount];
-        for (int i = 0; i < windowsCount; i++) {
-            res[i] = jwindows.get(i).getNumber("id").intValue();
-        }
-        return res;
-    }
-
-}
--- /dev/null	2016-10-31 09:37:02.128008072 -0400
+++ new/modules/javafx.jmx/src/shims/java/com/oracle/javafx/jmx/TestUtils.java	2016-11-02 13:32:15.087662275 -0400
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2013, 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.javafx.jmx;
+
+import com.oracle.javafx.jmx.json.JSONDocument;
+import com.oracle.javafx.jmx.json.JSONFactory;
+
+import java.io.StringReader;
+
+public class TestUtils {
+
+    static JSONDocument getJSONDocument(String source) {
+        return JSONFactory.instance().makeReader(new StringReader(source)).build();
+    }
+
+    static int[] getWindowIDs(JSONDocument jwindows) {
+        final int windowsCount = jwindows.array().size();
+        int res[] = new int[windowsCount];
+        for (int i = 0; i < windowsCount; i++) {
+            res[i] = jwindows.get(i).getNumber("id").intValue();
+        }
+        return res;
+    }
+
+}