Index: apisupport/project/src/org/netbeans/modules/apisupport/project/Actions.java
===================================================================
RCS file: /cvs/apisupport/project/src/org/netbeans/modules/apisupport/project/Actions.java,v
retrieving revision 1.21
diff -u -r1.21 Actions.java
--- apisupport/project/src/org/netbeans/modules/apisupport/project/Actions.java	20 Aug 2004 22:03:39 -0000	1.21
+++ apisupport/project/src/org/netbeans/modules/apisupport/project/Actions.java	5 Sep 2004 10:42:10 -0000
@@ -47,6 +47,7 @@
         actions.add(CommonProjectActions.newFileAction());
         actions.add(null);
         actions.add(createGlobalAction(project, new String[] {"netbeans"}, "Build"));
+        actions.add(createGlobalAction(project, new String[] {"debug"}, "Debug"));
         actions.add(createGlobalAction(project, new String[] {"clean", "netbeans"}, "Clean and Build"));
         actions.add(createGlobalAction(project, new String[] {"clean"}, "Clean"));
         actions.add(null);
@@ -113,6 +114,7 @@
         globalCommands.put(ActionProvider.COMMAND_BUILD, new String[] {"netbeans"}); // NOI18N
         globalCommands.put(ActionProvider.COMMAND_CLEAN, new String[] {"clean"}); // NOI18N
         globalCommands.put(ActionProvider.COMMAND_REBUILD, new String[] {"clean", "netbeans"}); // NOI18N
+        globalCommands.put(ActionProvider.COMMAND_DEBUG, new String[] {"debug"}); // NOI18N
         /* Too dangerous:
         globalCommands.put(ActionProvider.COMMAND_RUN, new String[] {"reload"}); // NOI18N
          */
Index: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.552
diff -u -r1.552 build.xml
--- nbbuild/build.xml	2 Sep 2004 12:08:25 -0000	1.552
+++ nbbuild/build.xml	5 Sep 2004 10:42:11 -0000
@@ -2771,6 +2771,7 @@
   
   <target name="tryme-debug" depends="init,maybe-build-nozip" if="debug.port" >
     <property name="debug.pause" value="n" />
+    <property name="debug.server" value="y" />
   
     <exec os="Windows NT Windows 95 Windows 98 Windows 2000 Windows XP" executable="${netbeans.dest.abs}/bin/nb.exe" failonerror="yes">
       <arg value="-jdkhome"/>
@@ -2778,7 +2779,7 @@
       <arg value="-userdir"/>
       <arg file="${test.user.dir}"/>
       <arg line="${tryme.args}"/>
-      <arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=y,address=${debug.port}" />
+      <arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" />
     </exec>
     <exec os="Linux SunOS Solaris Mac OS X" dir="." executable="sh" failonerror="yes">
       <arg value="${netbeans.dest}/bin/netbeans"/>
@@ -2787,8 +2788,19 @@
       <arg value="-userdir"/>
       <arg file="${test.user.dir}"/>
       <arg line="${tryme.args}"/>
-      <arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=y,address=${debug.port}" />
+      <arg line="-J-Xdebug -J-Xnoagent -J-Xrunjdwp:transport=dt_socket,suspend=${debug.pause},server=${debug.server},address=${debug.port}" />
     </exec>
+  </target>
+  <target name="tryme-nbjpda" depends="init,maybe-build-nozip" if="netbeans.home" >
+    <nbjpdastart name="NetBeans" addressproperty="debug.port" transport="dt_socket">
+        <classpath>
+            <fileset dir="netbeans" >
+                <include name="**/*.jar" />
+            </fileset>
+        </classpath>
+    </nbjpdastart>
+    <property name="debug.server" value="n" />
+    <antcall target="tryme-debug" />
   </target>
   
   <target name="check-target-dependencies" depends="bootstrap" description="Check that all-* targets are up to date.">
Index: nbbuild/templates/projectized.xml
===================================================================
RCS file: /cvs/nbbuild/templates/projectized.xml,v
retrieving revision 1.24
diff -u -r1.24 projectized.xml
--- nbbuild/templates/projectized.xml	25 Aug 2004 10:01:26 -0000	1.24
+++ nbbuild/templates/projectized.xml	5 Sep 2004 10:42:12 -0000
@@ -334,6 +334,11 @@
             <arg line="${test.class}"/>
         </java>
     </target>
+    
+    <target name="debug" depends="netbeans" >
+        <ant dir="${nb_all}/nbbuild/" target="tryme-nbjpda" />
+    </target>
+    
 
     <target name="debug-test-single" depends="init,test-init,test-build,do-debug-test-single"/>