--- old/make/jdk/netbeans/client_sanity/build.xml	2020-04-29 12:11:24.372610586 +0200
+++ /dev/null	2020-02-11 10:29:13.086348146 +0100
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="SanityTests" default="default" basedir=".">
-    <description>Builds, tests, and runs the project SanityTests.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar:                  JAR building
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="SanityTests-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-    
-    <target name="prepare-bundle" depends="init">
-        <zip zipfile="${dist.dir}/sanity.zip">
-            <fileset dir="../../../test" includes="sanity/client/SwingSet/**"/>
-            <fileset dir="../../../test" includes="sanity/client/lib/**"/>
-            <fileset dir="../../../test" includes="sanity/client/ReadMe.txt"/>
-            <fileset dir="../../../test" includes="sanity/client/TEST.properties"/>            
-            <mappedresources>
-                <fileset dir="../../../test/sanity/client" includes="TEST.ROOT.template"/>
-                <globmapper from="TEST.ROOT.template" to="TEST.ROOT" />
-            </mappedresources>            
-        </zip>
-    </target>
-    
-    <target name="run-jemmy-browser" depends="init">
-        <java 
-            classpath="${run.classpath}"
-            classname="org.netbeans.jemmy.explorer.GUIBrowser" 
-            args="com.sun.swingset3.demos.button.ButtonDemo"/>
-    </target>
-    
-</project>
--- /dev/null	2020-02-11 10:29:13.086348146 +0100
+++ new/make/ide/netbeans/jdk/client_sanity/build.xml	2020-04-29 12:11:23.992610589 +0200
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="SanityTests" default="default" basedir=".">
+    <description>Builds, tests, and runs the project SanityTests.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar:                  JAR building
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="SanityTests-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+    
+    <target name="prepare-bundle" depends="init">
+        <zip zipfile="${dist.dir}/sanity.zip">
+            <fileset dir="../../../test" includes="sanity/client/SwingSet/**"/>
+            <fileset dir="../../../test" includes="sanity/client/lib/**"/>
+            <fileset dir="../../../test" includes="sanity/client/ReadMe.txt"/>
+            <fileset dir="../../../test" includes="sanity/client/TEST.properties"/>            
+            <mappedresources>
+                <fileset dir="../../../test/sanity/client" includes="TEST.ROOT.template"/>
+                <globmapper from="TEST.ROOT.template" to="TEST.ROOT" />
+            </mappedresources>            
+        </zip>
+    </target>
+    
+    <target name="run-jemmy-browser" depends="init">
+        <java 
+            classpath="${run.classpath}"
+            classname="org.netbeans.jemmy.explorer.GUIBrowser" 
+            args="com.sun.swingset3.demos.button.ButtonDemo"/>
+    </target>
+    
+</project>