From 940a4e12d1b304fb841f5bcdbd2b62fac692f3b1 Mon Sep 17 00:00:00 2001
From: Eirik Bjorsnos <eirbjo@gmail.com>
Date: Mon, 10 Jul 2023 21:48:03 +0000
Subject: [PATCH] 8304503: Modernize debugging jvm args in demo netbeans
 projects

Reviewed-by: prr
---
 .../share/nbproject/jfc/FileChooserDemo/build.properties   | 2 +-
 .../jfc/FileChooserDemo/nbproject/netbeans-targets.xml     | 7 ++-----
 src/demo/share/nbproject/jfc/Font2DTest/build.properties   | 2 +-
 .../jfc/Font2DTest/nbproject/netbeans-targets.xml          | 7 ++-----
 src/demo/share/nbproject/jfc/Metalworks/build.properties   | 2 +-
 .../jfc/Metalworks/nbproject/netbeans-targets.xml          | 7 ++-----
 src/demo/share/nbproject/jfc/Notepad/build.properties      | 2 +-
 .../nbproject/jfc/Notepad/nbproject/netbeans-targets.xml   | 7 ++-----
 src/demo/share/nbproject/jfc/SampleTree/build.properties   | 2 +-
 .../jfc/SampleTree/nbproject/netbeans-targets.xml          | 7 ++-----
 src/demo/share/nbproject/jfc/TableExample/build.properties | 2 +-
 .../jfc/TableExample/nbproject/netbeans-targets.xml        | 7 ++-----
 .../share/nbproject/jfc/TransparentRuler/build.properties  | 2 +-
 .../jfc/TransparentRuler/nbproject/netbeans-targets.xml    | 7 ++-----
 14 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties b/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
index cc794cf4f5d..354c3bbdabc 100644
--- a/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
+++ b/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/FileChooserDemo
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
index ac5178cfa30..a95dd376609 100644
--- a/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/Font2DTest/build.properties b/src/demo/share/nbproject/jfc/Font2DTest/build.properties
index 6007cd75194..4b84026f90a 100644
--- a/src/demo/share/nbproject/jfc/Font2DTest/build.properties
+++ b/src/demo/share/nbproject/jfc/Font2DTest/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Font2DTest
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml
index b40575d3667..4a0baefef11 100644
--- a/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/Metalworks/build.properties b/src/demo/share/nbproject/jfc/Metalworks/build.properties
index 7a085159923..67842ab17a6 100644
--- a/src/demo/share/nbproject/jfc/Metalworks/build.properties
+++ b/src/demo/share/nbproject/jfc/Metalworks/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Metalworks
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml
index b31e670af65..61600a42881 100644
--- a/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/Notepad/build.properties b/src/demo/share/nbproject/jfc/Notepad/build.properties
index 7d2c25a9088..d057d8e0f4b 100644
--- a/src/demo/share/nbproject/jfc/Notepad/build.properties
+++ b/src/demo/share/nbproject/jfc/Notepad/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/Notepad
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml
index 7a0b1bec5fb..ee89bd8ef27 100644
--- a/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/SampleTree/build.properties b/src/demo/share/nbproject/jfc/SampleTree/build.properties
index 5d90b3bea5a..c6ea2c9eabe 100644
--- a/src/demo/share/nbproject/jfc/SampleTree/build.properties
+++ b/src/demo/share/nbproject/jfc/SampleTree/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/SampleTree
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml
index 9a7810f4d71..65550cfd3bb 100644
--- a/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/TableExample/build.properties b/src/demo/share/nbproject/jfc/TableExample/build.properties
index b23535ce172..35ed324e056 100644
--- a/src/demo/share/nbproject/jfc/TableExample/build.properties
+++ b/src/demo/share/nbproject/jfc/TableExample/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/TableExample
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
index 00822acc570..56251eb2a82 100644
--- a/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>
     
diff --git a/src/demo/share/nbproject/jfc/TransparentRuler/build.properties b/src/demo/share/nbproject/jfc/TransparentRuler/build.properties
index b1b2ef89b82..333c6515adb 100644
--- a/src/demo/share/nbproject/jfc/TransparentRuler/build.properties
+++ b/src/demo/share/nbproject/jfc/TransparentRuler/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/TransparentRuler
 
-src.dir=${main.dir}/src
+src.dir=${main.dir}/
 
 build.dir=build
 classes.dir=${build.dir}/classes
diff --git a/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml b/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
index 84a0e9b3c5e..663b96fc147 100644
--- a/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
         </nbjpdastart>
         <java classname="${main.class}" failonerror="true" fork="true">
             <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
         </java>
     </target>